Igor Canadi ddbd1ece88 Merge branch 'master' into columnfamilies ... Conflicts: db/db_impl.cc db/db_test.cc db/internal_stats.cc db/internal_stats.h db/version_edit.cc db/version_edit.h db/version_set.cc include/rocksdb/options.h util/options.cc		2014-03-31 13:39:24 -07:00
..
backupable_db.h	Rate limiter for BackupableDB	2014-03-24 11:38:44 -07:00
geo_db.h	A GIS implementation for rocksdb.	2014-03-28 15:26:44 -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