Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1f37f1dd
Commit
1f37f1dd
authored
Sep 10, 2018
by
antirez
Browse files
Slave removal: SLAVEOF -> REPLICAOF. SLAVEOF is now an alias.
parent
7928f578
Changes
3
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
1f37f1dd
...
@@ -1997,7 +1997,7 @@ void replicationHandleMasterDisconnection(void) {
...
@@ -1997,7 +1997,7 @@ void replicationHandleMasterDisconnection(void) {
* the slaves only if we'll have to do a full resync with our master. */
* the slaves only if we'll have to do a full resync with our master. */
}
}
void
slave
ofCommand
(
client
*
c
)
{
void
replica
ofCommand
(
client
*
c
)
{
/* SLAVEOF is not allowed in cluster mode as replication is automatically
/* SLAVEOF is not allowed in cluster mode as replication is automatically
* configured using the current address of the master node. */
* configured using the current address of the master node. */
if
(
server
.
cluster_enabled
)
{
if
(
server
.
cluster_enabled
)
{
...
...
src/server.c
View file @
1f37f1dd
...
@@ -260,7 +260,8 @@ struct redisCommand redisCommandTable[] = {
...
@@ -260,7 +260,8 @@ struct redisCommand redisCommandTable[] = {
{"touch",touchCommand,-2,"rF",0,NULL,1,1,1,0,0},
{"touch",touchCommand,-2,"rF",0,NULL,1,1,1,0,0},
{"pttl",pttlCommand,2,"rFR",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},
{"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},
{"role",roleCommand,1,"lst",0,NULL,0,0,0,0,0},
{"debug",debugCommand,-2,"as",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},
{"config",configCommand,-2,"last",0,NULL,0,0,0,0,0},
...
...
src/server.h
View file @
1f37f1dd
...
@@ -1998,7 +1998,7 @@ void ttlCommand(client *c);
...
@@ -1998,7 +1998,7 @@ void ttlCommand(client *c);
void
touchCommand
(
client
*
c
);
void
touchCommand
(
client
*
c
);
void
pttlCommand
(
client
*
c
);
void
pttlCommand
(
client
*
c
);
void
persistCommand
(
client
*
c
);
void
persistCommand
(
client
*
c
);
void
slave
ofCommand
(
client
*
c
);
void
replica
ofCommand
(
client
*
c
);
void
roleCommand
(
client
*
c
);
void
roleCommand
(
client
*
c
);
void
debugCommand
(
client
*
c
);
void
debugCommand
(
client
*
c
);
void
msetCommand
(
client
*
c
);
void
msetCommand
(
client
*
c
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment