Merge branch 'unstable' into incrbyfloat

This commit is contained in:
antirez
2011-11-14 15:59:56 +01:00
6 changed files with 22 additions and 8 deletions

View File

@ -39,7 +39,7 @@
/* Static server configuration */
#define REDIS_SERVERPORT 6379 /* TCP port */
#define REDIS_MAXIDLETIME (60*5) /* default client timeout */
#define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */
#define REDIS_IOBUF_LEN (1024*16)
#define REDIS_LOADBUF_LEN 1024
#define REDIS_DEFAULT_DBNUM 16