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	Merge branch 'master' into columnfamilies	2014-03-10 17:26:09 -07:00
merge_operators	Remove .DS_Store files.	2013-12-17 06:00:47 +01:00
redis	Fixed typos	2013-11-16 11:21:34 +00:00
ttl	[CF] Rethinking ColumnFamilyHandle and fix to dropping column families	2014-02-12 13:47:09 -08:00
merge_operators.h	Add appropriate LICENSE and Copyright message.	2013-10-16 17:48:41 -07:00