Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/test/karma/karma.conf.js		2013-12-20 15:35:50 +01:00
..
EndpointServer.h	runtime addition and removal of endpoints	2013-09-12 18:07:39 +02:00
GeneralAsyncCommTask.h	updated disclaimer	2013-03-13 17:03:18 +01:00
GeneralCommTask.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
GeneralListenTask.h	removed unused private variable (fixes compiler warning)	2013-06-28 15:44:59 +02:00
GeneralServer.h	improve error message	2013-10-30 14:38:20 +01:00
GeneralServerDispatcher.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
GeneralServerJob.h	not sure about the restshardhandler yet	2013-12-12 17:51:45 +01:00
GeneralSslServer.h	removed second logger implementation	2013-10-30 00:38:25 +01:00
SpecificCommTask.h	updated disclaimer	2013-03-13 17:03:18 +01:00
SslAsyncCommTask.h	added --server.ssl-protocol option for client tools	2013-12-13 17:58:24 +01:00