Merge branch 'master' of https://github.com/facebook/rocksdb into OptionTestFix

This commit is contained in:
SherlockNoMad 2015-10-30 15:59:02 -07:00
commit 9ac88c8551

View File

@ -315,7 +315,7 @@ DEFINE_int32(compaction_style, (int32_t) rocksdb::Options().compaction_style,
"style of compaction: level-based vs universal");
static rocksdb::CompactionPri FLAGS_compaction_pri_e;
DEFINE_int32(compaction_pri, (int32_t)rocksdb::Options().compaction_style,
DEFINE_int32(compaction_pri, (int32_t)rocksdb::Options().compaction_pri,
"priority of files to compaction: by size or by data age");
DEFINE_int32(universal_size_ratio, 0,