Merge branch 'unstable' into unstable-zset

Conflicts:
	src/object.c

diff --cc src/config.c
Simple merge

diff --cc src/object.c
index c384d6004522af47a2fbf5055f7522434994344c,6a9b0214db024645bfbd0351a6538af41b10d281..4bf1df01fe9c5dce7edae769d25406ed8acaa442
--- 1/src/object.c
--- 2/src/object.c
+++ b/src/object.c
@@@ -93,18 -93,15 +93,22 @@@ robj *createHashObject(void) 
  
  robj *createZsetObject(void) {
      zset *zs = zmalloc(sizeof(*zs));
+     robj *o;
+ 
      zs->dict = dictCreate(&zsetDictType,NULL);
      zs->zsl = zslCreate();
-     return createObject(REDIS_ZSET,zs);
+     o = createObject(REDIS_ZSET,zs);
+     o->encoding = REDIS_ENCODING_SKIPLIST;
+     return o;
  }
  
 +robj *createZsetZiplistObject(void) {
 +    unsigned char *zl = ziplistNew();
 +    robj *o = createObject(REDIS_ZSET,zl);
 +    o->encoding = REDIS_ENCODING_ZIPLIST;
 +    return o;
 +}
 +
  void freeStringObject(robj *o) {
      if (o->encoding == REDIS_ENCODING_RAW) {
          sdsfree(o->ptr);

diff --cc src/rdb.c
Simple merge

diff --cc src/redis.c
index 2b98d40c530aaec2af6c51ec9e8ca57846d2ef97,9c726151fb66a87f5edbd7a712327ac982bbb640..3d0f53788640ce7f1c5d52e2b3d3faadefadf52c
--- 1/src/redis.c
--- 2/src/redis.c
+++ b/src/redis.c
@@@ -821,10 -840,10 +840,12 @@@ void initServerConfig() 
      server.list_max_ziplist_entries = REDIS_LIST_MAX_ZIPLIST_ENTRIES;
      server.list_max_ziplist_value = REDIS_LIST_MAX_ZIPLIST_VALUE;
      server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES;
 +    server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
 +    server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
      server.shutdown_asap = 0;
      server.cache_flush_delay = 0;
+     server.cluster_enabled = 0;
+     server.cluster.configfile = zstrdup("nodes.conf");
  
      updateLRUClock();
      resetServerSaveParams();

diff --cc src/redis.h
Simple merge

diff --cc src/ziplist.c
Simple merge