Merge branch 'develop' into MAX-59

2014-06-27 11:07:55 +02:00
parent c13275c0e7 de5d4fda8b
commit 237bacd131
15 changed files with 336 additions and 36 deletions
--- a/server/core/server.c
+++ b/server/core/server.c
@ -324,7 +324,8 @@ char	*stat;
 		}
 	}
 	if (server->node_ts > 0) {
-		dcb_printf(dcb, "\tLast Repl Heartbeat:\t%lu\n", server->node_ts);
+		dcb_printf(dcb, "\tLast Repl Heartbeat:\t%s",
+					asctime(localtime(&server->node_ts)));
 	}
 	dcb_printf(dcb, "\tNumber of connections:	%d\n", server->stats.n_connections);
 	dcb_printf(dcb, "\tCurrent no. of conns:	%d\n", server->stats.n_current);