Merge branch 'unstable' into unstable-zset

Conflicts:
	src/object.c
This commit is contained in:
Pieter Noordhuis
2011-04-06 16:15:01 +02:00
24 changed files with 2362 additions and 181 deletions

View File

@ -245,7 +245,7 @@ int rdbSaveDoubleValue(FILE *fp, double val) {
return rdbWriteRaw(fp,buf,len);
}
/* Save a Redis object. */
/* Save a Redis object. Returns -1 on error, 0 on success. */
int rdbSaveObject(FILE *fp, robj *o) {
int n, nwritten = 0;