Merge branch 'master' into columnfamilies

This commit is contained in:
Igor Canadi
2014-01-13 09:06:44 -08:00
22 changed files with 680 additions and 151 deletions

View File

@@ -628,4 +628,7 @@ extern Options SanitizeOptions(const std::string& db,
CompressionType GetCompressionType(const Options& options, int level,
const bool enable_compression);
// Determine compression type for L0 file written by memtable flush.
CompressionType GetCompressionFlush(const Options& options);
} // namespace rocksdb