rocksdb: pull up to master, include EnvMirror

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/Makefile-rocksdb.am b/src/Makefile-rocksdb.am
index 677829deba798df283958992756f70d6d0600dac..d7734768c4d685ee633e6511182ef88ce25576bc 100644 (file)
--- a/src/Makefile-rocksdb.am
+++ b/src/Makefile-rocksdb.am
@@ -195,6 +195,7 @@ EXTRA_DIST += \
   rocksdb/include/rocksdb/types.h \
   rocksdb/include/rocksdb/utilities/db_ttl.h \
   rocksdb/include/rocksdb/utilities/document_db.h \
+  rocksdb/include/rocksdb/utilities/env_mirror.h \
   rocksdb/include/rocksdb/utilities/geo_db.h \
   rocksdb/include/rocksdb/utilities/json_document.h \
   rocksdb/include/rocksdb/utilities/leveldb_options.h \
@@ -683,6 +684,7 @@ EXTRA_DIST += \
   rocksdb/utilities/document/document_db_test.cc \
   rocksdb/utilities/document/json_document.cc \
   rocksdb/utilities/document/json_document_test.cc \
+  rocksdb/utilities/env_mirror.cc \
   rocksdb/utilities/geodb/geodb_impl.cc \
   rocksdb/utilities/geodb/geodb_impl.h \
   rocksdb/utilities/geodb/geodb_test.cc \

diff --git a/src/rocksdb b/src/rocksdb
index 75a8bad2abcb9932913288e47ca1adaa03de4c0a..00d6edf6a0080ac3961e56213ae962ec1d570daa 160000 (submodule)
--- a/src/rocksdb
+++ b/src/rocksdb
@@ -1 +1 @@
-Subproject commit 75a8bad2abcb9932913288e47ca1adaa03de4c0a
+Subproject commit 00d6edf6a0080ac3961e56213ae962ec1d570daa