Igor Canadi 9d0577a6be Merge branch 'master' into columnfamilies ... Conflicts: db/db_impl.cc db/db_impl.h db/transaction_log_impl.cc db/transaction_log_impl.h include/rocksdb/options.h util/env.cc util/options.cc		2014-03-03 18:29: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-03-03 18:29:03 -08:00
utility_db.h	Migrate names of properties from 'leveldb' prefix to 'rocksdb' prefix.	2013-10-06 00:14:26 -07:00