From 07a47a3ba57e65b396464babe8cb91dd9f201494 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 11 Dec 2015 09:32:30 -0500 Subject: [PATCH] rocksdb: pull up to master, include EnvMirror Signed-off-by: Sage Weil --- src/Makefile-rocksdb.am | 2 ++ src/rocksdb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile-rocksdb.am b/src/Makefile-rocksdb.am index 677829deba798..d7734768c4d68 100644 --- 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 75a8bad2abcb9..00d6edf6a0080 160000 --- a/src/rocksdb +++ b/src/rocksdb @@ -1 +1 @@ -Subproject commit 75a8bad2abcb9932913288e47ca1adaa03de4c0a +Subproject commit 00d6edf6a0080ac3961e56213ae962ec1d570daa -- 2.39.5