diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /libglusterfs/src/unittest | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to 'libglusterfs/src/unittest')
| -rw-r--r-- | libglusterfs/src/unittest/log_mock.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libglusterfs/src/unittest/log_mock.c b/libglusterfs/src/unittest/log_mock.c index 676df7cfd..fec48bafc 100644 --- a/libglusterfs/src/unittest/log_mock.c +++ b/libglusterfs/src/unittest/log_mock.c @@ -39,5 +39,12 @@ int _gf_log_nomem (const char *domain, const char *file, return 0; } +int _gf_msg_nomem (const char *domain, const char *file, + const char *function, int line, gf_loglevel_t level, + size_t size) +{ + return 0; +} + void gf_log_globals_init (void *data) {} |