Updated to unstable

diff --cc redis.conf
index f962b970407acf9696901ec99e0c076e80b520fb,87d34eef02cf580930d913e2de4e38722092a2c5..6999dae3476cff578f8bed2004575ecfe73d037d
--- 1/redis.conf
--- 2/redis.conf
+++ b/redis.conf
@@@ -292,13 -292,26 +292,33 @@@ appendfsync everyse
  # "no" that is the safest pick from the point of view of durability.
  no-appendfsync-on-rewrite no
  
+ # Automatic rewrite of the append only file.
+ # Redis is able to automatically rewrite the log file implicitly calling
+ # BGREWRITEAOF when the AOF log size will growth by the specified percentage.
+ # 
+ # This is how it works: Redis remembers the size of the AOF file after the
+ # latest rewrite (or if no rewrite happened since the restart, the size of
+ # the AOF at startup is used).
+ #
+ # This base size is compared to the current size. If the current size is
+ # bigger than the specified percentage, the rewrite is triggered. Also
+ # you need to specify a minimal size for the AOF file to be rewritten, this
+ # is useful to avoid rewriting the AOF file even if the percentage increase
+ # is reached but it is still pretty small.
+ #
+ # Specify a precentage of zero in order to disable the automatic AOF
+ # rewrite feature.
+ 
+ auto-aof-rewrite-percentage 100
+ auto-aof-rewrite-min-size 64mb
+ 
 +################################ LUA SCRIPTING  ###############################
 +
 +# Max execution time of a Lua script in milliseconds.
 +# This prevents that a programming error generating an infinite loop will block
 +# your server forever. Set it to 0 or a negative value for unlimited execution.
 +lua-time-limit 60000
 +
  #################################### DISK STORE ###############################
  
  # When disk store is active Redis works as an on-disk database, where memory

diff --cc src/Makefile
index ee2bf5e34c4a46b5a7eb12abb15c145d407713d3,8d903c9091a87d49410ee716d052dccf85baf58e..e23ed038c0dc2042b171e7fbc2b56be728754c24
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -46,7 -46,12 +46,12 @@@ BINCOLOR="\033[37;1m
  MAKECOLOR="\033[32;1m"
  ENDCOLOR="\033[0m"
  
 -OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o dscache.o pubsub.o multi.o debug.o sort.o intset.o syncio.o diskstore.o cluster.o crc16.o endian.o
+ ifndef V
+ QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
+ QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
+ endif
+ 
 +OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o dscache.o pubsub.o multi.o debug.o sort.o intset.o syncio.o diskstore.o cluster.o crc16.o endian.o scripting.o
  BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
  CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o
  CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o
@@@ -132,45 -137,35 +137,37 @@@ zipmap.o: zipmap.c zmalloc.
  zmalloc.o: zmalloc.c config.h
  
  dependencies:
-       @echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
+       @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
        @cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
-       @echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
+       @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR)
        @cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
 +      @echo $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)Lua ansi$(ENDCOLOR)
 +      @cd ../deps/lua && $(MAKE) ARCH="$(ARCH)" ansi
  
  redis-server: $(OBJ)
-       @$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) ../deps/lua/src/liblua.a
-       @echo $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$(@)$(ENDCOLOR)
 -      $(QUIET_CC)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
++      $(QUIET_CC)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) ../deps/lua/src/liblua.a
  
  redis-benchmark: dependencies $(BENCHOBJ)
        @cd ../deps/hiredis && $(MAKE) static
-       @$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
-       @echo $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$(@)$(ENDCOLOR)
+       $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
  
  redis-benchmark.o:
-       @$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
-       @echo $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$(<)$(ENDCOLOR)
+       $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
  
  redis-cli: dependencies $(CLIOBJ)
-       @$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
-       @echo $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$(@)$(ENDCOLOR)
+       $(QUIET_LINK)$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
  
  redis-cli.o:
-       @$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
-       @echo $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$(<)$(ENDCOLOR)
+       $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
  
  redis-check-dump: $(CHECKDUMPOBJ)
-       @$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
-       @echo $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$(@)$(ENDCOLOR)
+       $(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
  
  redis-check-aof: $(CHECKAOFOBJ)
-       @$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
-       @echo $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$(@)$(ENDCOLOR)
+       $(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
  
  .c.o:
-       @$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) -I../deps/lua/src $<
-       @echo $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$(<)$(ENDCOLOR)
 -      $(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
++      $(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) -I../deps/lua/src $<
  
  clean:
        rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) $(CHECKAOFPRGNAME) *.o *.gcda *.gcno *.gcov

diff --cc src/config.c
Simple merge

diff --cc src/redis.c
Simple merge

diff --cc src/redis.h
Simple merge

diff --cc tests/test_helper.tcl
Simple merge