Igor Canadi ccdb93e775 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	db/db_impl.h
	db/memtable_list.cc
	db/memtable_list.h
	db/version_set.cc
	db/version_set.h

2014-02-12 14:01:30 -08:00

..

rocksdb

Merge branch 'master' into columnfamilies

2014-02-12 14:01:30 -08:00

utilities

[CF] Rethinking ColumnFamilyHandle and fix to dropping column families

2014-02-12 13:47:09 -08:00