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

Conflicts:
	utilities/backupable/backupable_db.cc

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

..

backupable_db_test.cc

Merge branch 'master' into columnfamilies

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

backupable_db.cc

keep_log_files option in BackupableDB

2014-03-17 15:39:23 -07:00