Igor Canadi 76c048183c Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	db/db_test.cc
	include/rocksdb/db.h

2014-02-14 16:46:03 -08:00

..

backupable_db.h

Better interface to create BackupEngine

2014-01-28 16:01:53 -08:00

stackable_db.h

Merge branch 'master' into columnfamilies

2014-02-14 16:46:03 -08:00

utility_db.h

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

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