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

Conflicts:
	Makefile
	db/db_impl.cc
	db/db_test.cc
	db/memtable_list.cc
	db/memtable_list.h
	table/block_based_table_reader.cc
	table/table_test.cc
	util/cache.cc
	util/coding.cc

2014-01-28 10:35:55 -08:00

..

rocksdb

Merge branch 'master' into performance

2014-01-28 10:35:55 -08:00

utilities

CompactRange() to return status

2014-01-23 16:41:46 -08:00