kailiu 1304d8c8ce Merge branch 'master' into performance ...

Conflicts:
	Makefile
	db/db_impl.cc
	db/db_impl.h
	db/db_test.cc
	db/memtable.cc
	db/memtable.h
	db/version_edit.h
	db/version_set.cc
	include/rocksdb/options.h
	util/hash_skiplist_rep.cc
	util/options.cc

2014-01-15 23:12:31 -08:00

..

rocksdb

Merge branch 'master' into performance

2014-01-15 23:12:31 -08:00

utilities

Feature requests for BackupableDB

2014-01-09 12:24:28 -08:00