Browse files

Fixed another merge typo

  • Loading branch information...
1 parent 3fee7e3 commit 9702c92c4fd2e56bd6d16de5c6b367acf1a44e18 @antirez committed Jul 15, 2011
Showing with 0 additions and 1 deletion.
  1. +0 −1 src/db.c
View
1 src/db.c
@@ -495,7 +495,6 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
addReply(c,shared.czero);
return;
}
- if (seconds <= 0 && !server.loading) {
/* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past
* should never be executed as a DEL when load the AOF or in the context
* of a slave instance.

0 comments on commit 9702c92

Please sign in to comment.