Merge remote-tracking branch 'upstream/master'

094bfd6b · Ceri Storey · 45d6436f · 5616f81d · 094bfd6b
Commit 094bfd6b authored Feb 29, 2016 by Ceri Storey
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib.rs src/lib.rs +1 -1

No files found.
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ pub use ffi as rocksdb_ffi;
 pub use ffi::{DBCompactionStyle, DBComparator, new_bloom_filter};
 pub use rocksdb::{DB, DBIterator, DBVector, Direction, IteratorMode, Writable,
                  WriteBatch};
-pub use rocksdb_options::{BlockBasedOptions, Options, WriteOptions};
+pub use rocksdb_options::{BlockBasedOptions, Options};
 pub use merge_operator::MergeOperands;
 pub mod rocksdb;
 pub mod ffi;