Merge branch 'master' into columnfamilies

This commit is contained in:
Igor Canadi
2014-01-24 18:34:48 -08:00
15 changed files with 37 additions and 15 deletions

View File

@@ -17,6 +17,10 @@
#include "rocksdb/env.h"
#include "rocksdb/filter_policy.h"
#include "rocksdb/merge_operator.h"
#include "rocksdb/memtablerep.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table_properties.h"
#include "table/block_based_table_factory.h"
namespace rocksdb {