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_test.cc

Merge branch 'master' into columnfamilies

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

backupable_db.cc

Rate limiter for BackupableDB

2014-03-24 11:38:44 -07:00