Igor Canadi 28d1a0c6f5 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	db/db_impl.h
	db/db_impl_readonly.h
	db/db_test.cc
	include/rocksdb/db.h
	include/utilities/stackable_db.h

2014-01-24 09:27:29 -08:00

..

backupable_db.h

Feature requests for BackupableDB

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

stackable_db.h

Merge branch 'master' into columnfamilies

2014-01-24 09:27:29 -08:00

utility_db.h

Migrate names of properties from 'leveldb' prefix to 'rocksdb' prefix.

2013-10-06 00:14:26 -07:00