kailiu f1cec73a76 Merge branch 'master' into performance ...

Conflicts:
	db/db_impl.cc
	db/db_test.cc
	db/memtable.cc
	db/version_set.cc
	include/rocksdb/statistics.h

2013-12-27 12:23:17 -08:00

..

rocksdb

Merge branch 'master' into performance

2013-12-27 12:23:17 -08:00

utilities

BackupableDB delete backups with newer seq number

2013-12-10 20:49:28 -08:00