Igor Canadi 0738ae6dc9 Merge branch 'master' into columnfamilies ... Conflicts: db/db_impl.cc		2014-03-05 12:25:05 -08:00
..
backupable_db.h	Some fixes to BackupableDB	2014-03-04 17:02:25 -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