Merge remote-tracking branch 'origin/2.6' into 2.6

diff --combined src/redis.c
index 8dc6b9a9220714e22c14ef7f8238f2c295d06e49,aa5a73f2abae195632463461416acf60c5c3f887..f26bdab0c09f3eada27552cab73c2be443887883
--- 1/src/redis.c
--- 2/src/redis.c
+++ b/src/redis.c
@@@ -1623,7 -1623,6 +1623,7 @@@ int processCommand(redisClient *c) 
  
      /* Lua script too slow? Only allow commands with REDIS_CMD_STALE flag. */
      if (server.lua_timedout &&
 +          c->cmd->proc != authCommand &&
          !(c->cmd->proc == shutdownCommand &&
            c->argc == 2 &&
            tolower(((char*)c->argv[1]->ptr)[0]) == 'n') &&
@@@ -2579,6 -2578,11 +2579,11 @@@ int main(int argc, char **argv) 
              redisLog(REDIS_NOTICE,"The server is now ready to accept connections at %s", server.unixsocket);
      }
  
+     /* Warning the user about suspicious maxmemory setting. */
+     if (server.maxmemory > 0 && server.maxmemory < 1024*1024) {
+         redisLog(REDIS_WARNING,"WARNING: You specified a maxmemory value that is less than 1MB (current value is %llu bytes). Are you sure this is what you really want?", server.maxmemory);
+     }
+ 
      aeSetBeforeSleepProc(server.el,beforeSleep);
      aeMain(server.el);
      aeDeleteEventLoop(server.el);