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

1 files changed, 3 insertions, 3 deletions

diff --git a/libglusterfs/src/mem-pool.h b/libglusterfs/src/mem-pool.h
index aa6bf7843..9ffeef4da 100644
--- a/libglusterfs/src/mem-pool.h
+++ b/libglusterfs/src/mem-pool.h
@@ -75,7 +75,7 @@ void* __gf_default_malloc (size_t size)
 
         ptr = malloc (size);
         if (!ptr)
-                gf_log_nomem ("", GF_LOG_ALERT, size);
+                gf_msg_nomem ("", GF_LOG_ALERT, size);
 
         return ptr;
 }
@@ -87,7 +87,7 @@ void* __gf_default_calloc (int cnt, size_t size)
 
         ptr = calloc (cnt, size);
         if (!ptr)
-                gf_log_nomem ("", GF_LOG_ALERT, (cnt * size));
+                gf_msg_nomem ("", GF_LOG_ALERT, (cnt * size));
 
         return ptr;
 }
@@ -99,7 +99,7 @@ void* __gf_default_realloc (void *oldptr, size_t size)
 
         ptr = realloc (oldptr, size);
         if (!ptr)
-                gf_log_nomem ("", GF_LOG_ALERT, size);
+                gf_msg_nomem ("", GF_LOG_ALERT, size);
 
         return ptr;
 }