summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan-Erik Rediger <badboy@archlinux.us>2014-02-03 21:50:23 +0100
committerMatt Stancliff <matt@genges.com>2014-09-29 06:49:06 -0400
commit9f98b29cefc337d607016cea57216cde1c25dd47 (patch)
treef04909a467f70ac8794d803228f44f96cc77e833 /src
parent4d2042212c805152740b7e30a362bf14b85bee2f (diff)
downloadredis-9f98b29cefc337d607016cea57216cde1c25dd47.tar.gz
Fix typo: ad -> and
Closes #1537
Diffstat (limited to 'src')
-rw-r--r--src/replication.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/replication.c b/src/replication.c
index ff0a0141a..40f33f812 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -200,7 +200,7 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
/* We need to feed the buffer with the object as a bulk reply
* not just as a plain string, so create the $..CRLF payload len
- * ad add the final CRLF */
+ * and add the final CRLF */
aux[0] = '$';
len = ll2string(aux+1,sizeof(aux)-1,objlen);
aux[len+1] = '\r';
@@ -408,7 +408,7 @@ need_full_resync:
return REDIS_ERR;
}
-/* SYNC ad PSYNC command implemenation. */
+/* SYNC and PSYNC command implemenation. */
void syncCommand(redisClient *c) {
/* ignore SYNC if already slave or in monitor mode */
if (c->flags & REDIS_SLAVE) return;