Complete merge of latest develop branch

2015-06-22 10:39:13 +01:00
parent 4c38e2224b
commit b880350cf3
8 changed files with 990 additions and 60 deletions
--- a/server/include/server.h
+++ b/server/include/server.h
@ -44,7 +44,8 @@
 * 27/10/14	Massimiliano Pinto	Addition of SERVER_MASTER_STICKINESS
 * 19/02/15	Mark Riddoch		Addition of serverGetList
 * 01/06/15	Massimiliano Pinto	Addition of server_update_address/port
- *
+ * 19/06/15	Martin Brampton		Extra fields for persistent connections, CHK_SERVER
+
 * @endverbatim
 */