Igor Canadi 9634ba42ac Merge branch 'master' into columnfamilies ... Conflicts: db/compaction_picker.cc db/db_impl.cc db/db_impl.h db/tailing_iter.cc db/version_set.h include/rocksdb/options.h util/options.cc		2014-03-10 17:26:09 -07:00
..
backupable_db.h	Fix share_table_files bug	2014-03-10 14:42:03 -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