Igor Canadi e8168382c4 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	include/rocksdb/options.h
	util/options.cc

2014-03-25 11:09:40 -07:00

..

backupable_db.h

Rate limiter for BackupableDB

2014-03-24 11:38: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