From ef2c7a5bbb6d62b2f970bbb4a12d149d2d09faaf Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 10 Sep 2018 10:43:39 +0200 Subject: [PATCH] Slave removal: SLAVEOF -> REPLICAOF. SLAVEOF is now an alias. --- src/replication.c | 2 +- src/server.c | 3 ++- src/server.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/replication.c b/src/replication.c index 6d589c01..11fd3479 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1997,7 +1997,7 @@ void replicationHandleMasterDisconnection(void) { * the slaves only if we'll have to do a full resync with our master. */ } -void slaveofCommand(client *c) { +void replicaofCommand(client *c) { /* SLAVEOF is not allowed in cluster mode as replication is automatically * configured using the current address of the master node. */ if (server.cluster_enabled) { diff --git a/src/server.c b/src/server.c index 9d2a3718..92a3b17c 100644 --- a/src/server.c +++ b/src/server.c @@ -260,7 +260,8 @@ struct redisCommand redisCommandTable[] = { {"touch",touchCommand,-2,"rF",0,NULL,1,1,1,0,0}, {"pttl",pttlCommand,2,"rFR",0,NULL,1,1,1,0,0}, {"persist",persistCommand,2,"wF",0,NULL,1,1,1,0,0}, - {"slaveof",slaveofCommand,3,"ast",0,NULL,0,0,0,0,0}, + {"slaveof",replicaofCommand,3,"ast",0,NULL,0,0,0,0,0}, + {"replicaof",replicaofCommand,3,"ast",0,NULL,0,0,0,0,0}, {"role",roleCommand,1,"lst",0,NULL,0,0,0,0,0}, {"debug",debugCommand,-2,"as",0,NULL,0,0,0,0,0}, {"config",configCommand,-2,"last",0,NULL,0,0,0,0,0}, diff --git a/src/server.h b/src/server.h index 09348585..ae20aff6 100644 --- a/src/server.h +++ b/src/server.h @@ -1998,7 +1998,7 @@ void ttlCommand(client *c); void touchCommand(client *c); void pttlCommand(client *c); void persistCommand(client *c); -void slaveofCommand(client *c); +void replicaofCommand(client *c); void roleCommand(client *c); void debugCommand(client *c); void msetCommand(client *c);