Merge branch 'develop' into MAX-324

2015-03-05 10:45:48 +02:00
parent 561952e1ea d6da4c7501
commit 880adca73e
57 changed files with 4699 additions and 113 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -1247,6 +1247,10 @@ int i;
 	{
 		gateway.pollsleep = atoi(value);
        }
+	else if (strcmp(name, "ms_timestamp") == 0)
+	{
+	    skygw_set_highp(atoi(value));
+        }
 	else
 	{
 		for (i = 0; lognames[i].logname; i++)