Removed handling of deprecated hash-max-zipmap-entries nad hash-map-zipmap-value...

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 49221f2c04e7e1119549fee199a0f620897fe384..8a225b7179c5de72921f2ea4056ecdd8ae76f11c 100644 (file)
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -22,6 +22,12 @@ but it is better to keep them in mind:
   starting with '#'. All the major clients should be already fixed to work
   with the new INFO format.
 
   starting with '#'. All the major clients should be already fixed to work
   with the new INFO format.
 

+Also the following redis.conf and CONFIG GET / SET parameters changed name:
+
+    * hash-max-zipmap-entries, now replaced by hash-max-ziplist-entries
+    * hash-max-zipmap-value, now replaced by hash-max-ziplist-value
+    * glueoutputbuf was no completely removed as it does not make sense
+

 ---------
 CHANGELOG
 ---------
 ---------
 CHANGELOG
 ---------

diff --git a/src/config.c b/src/config.c
index d84cd474dd12b4eb855f6cf1e2e8baa29bf9199c..533a2a572a1cd311edf95c5dec784ef00586c978 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -202,8 +202,6 @@ void loadServerConfigFromString(char *config) {
             if ((server.repl_serve_stale_data = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
             if ((server.repl_serve_stale_data = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }

-        } else if (!strcasecmp(argv[0],"glueoutputbuf")) {
-            redisLog(REDIS_WARNING, "Deprecated configuration directive: \"%s\"", argv[0]);

         } else if (!strcasecmp(argv[0],"rdbcompression") && argc == 2) {
             if ((server.rdb_compression = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
         } else if (!strcasecmp(argv[0],"rdbcompression") && argc == 2) {
             if ((server.rdb_compression = yesnotoi(argv[1])) == -1) {
                 err = "argument must be 'yes' or 'no'"; goto loaderr;


@@ -262,12 +260,6 @@ void loadServerConfigFromString(char *config) {
         } else if (!strcasecmp(argv[0],"dbfilename") && argc == 2) {
             zfree(server.rdb_filename);
             server.rdb_filename = zstrdup(argv[1]);
         } else if (!strcasecmp(argv[0],"dbfilename") && argc == 2) {
             zfree(server.rdb_filename);
             server.rdb_filename = zstrdup(argv[1]);

-        } else if (!strcasecmp(argv[0],"hash-max-zipmap-entries") && argc == 2) {
-            redisLog(REDIS_WARNING, "Deprecated configuration directive: \"%s\"", argv[0]);
-            server.hash_max_ziplist_entries = memtoll(argv[1], NULL);
-        } else if (!strcasecmp(argv[0],"hash-max-zipmap-value") && argc == 2) {
-            redisLog(REDIS_WARNING, "Deprecated configuration directive: \"%s\"", argv[0]);
-            server.hash_max_ziplist_value = memtoll(argv[1], NULL);

         } else if (!strcasecmp(argv[0],"hash-max-ziplist-entries") && argc == 2) {
             server.hash_max_ziplist_entries = memtoll(argv[1], NULL);
         } else if (!strcasecmp(argv[0],"hash-max-ziplist-value") && argc == 2) {
         } else if (!strcasecmp(argv[0],"hash-max-ziplist-entries") && argc == 2) {
             server.hash_max_ziplist_entries = memtoll(argv[1], NULL);
         } else if (!strcasecmp(argv[0],"hash-max-ziplist-value") && argc == 2) {