Igor Canadi 64904b39a0 Merge branch 'master' into columnfamilies ...

Conflicts:
	utilities/backupable/backupable_db.cc

2014-03-17 17:57:14 -07:00

..

rocksdb

[CF] WriteBatch to take in ColumnFamilyHandle

2014-03-14 11:30:14 -07:00

utilities

Merge branch 'master' into columnfamilies

2014-03-17 17:57:14 -07:00