Merge branch 'unstable' into RELEASE_5

Snapchat · Mar 2, 2020 · 7a244bb · 7a244bb
2 parents 3ce6441 + 3eb847e
commit 7a244bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/help.h b/src/help.h
@@ -1168,7 +1168,13 @@ struct commandHelp {
     "destination numkeys key [key ...] [WEIGHTS weight] [AGGREGATE SUM|MIN|MAX]",
     "Add multiple sorted sets and store the resulting sorted set in a new key",
     4,
-    "2.0.0" }
+    "2.0.0" },
+    { "KEYDB.CRON",
+    "name [single/repeat] [optional: start] delay script numkeys [key N] [arg N]",
+    "Run a specified script after start + delay, optionally repeating every delay interval.  The job may be cancelled by deleting the key associated with the job (name parameter)",
+    10,
+    "6.5.2"
+    }
 };
 
 #endif
diff --git a/src/server.cpp b/src/server.cpp
@@ -1026,7 +1026,7 @@ struct redisCommand redisCommandTable[] = {
      "read-only fast noprop",
      0,NULL,0,0,0,0,0,0},
 
-    {"cron",cronCommand,-5,
+    {"keydb.cron",cronCommand,-5,
      "write use-memory",
      0,NULL,1,1,1,0,0,0},
 };