Igor Canadi 64904b39a0 Merge branch 'master' into columnfamilies ... Conflicts: utilities/backupable/backupable_db.cc		2014-03-17 17:57:14 -07:00
..
backupable_db.h	keep_log_files option in BackupableDB	2014-03-17 15:39:23 -07:00
stackable_db.h	[CF] NewIterators	2014-03-07 16:15:25 -08:00
utility_db.h	Migrate names of properties from 'leveldb' prefix to 'rocksdb' prefix.	2013-10-06 00:14:26 -07:00