summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFosco Marotto <fjm@fb.com>2019-04-23 15:20:22 -0700
committerFosco Marotto <fjm@fb.com>2019-04-23 15:20:22 -0700
commit628a7fd74b5611657106c57f724f1682b114684c (patch)
tree385f47bcacb073e57cbf1b4a128a00e75e8c05c9
parentfa1c26dc0c983f30f86f3ebd20535ef5bbd63572 (diff)
History and version updated to 6.0.2 for Java compilation fixes.v6.0.2
-rw-r--r--HISTORY.md5
-rw-r--r--include/rocksdb/version.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 06d4dd04b..0e722ac2c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
# Rocksdb Change Log
+## 6.0.2 (4/23/2019)
+## Bug Fixes
+* Fix build failures due to missing JEMALLOC_CXX_THROW macro (#5053)
+* Fix compilation on db_bench_tool.cc on Windows (#5227)
+
## 6.0.1 (3/26/2019)
### New Features
### Public API Change
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 78f5b4a52..6813581b0 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
#define ROCKSDB_MAJOR 6
#define ROCKSDB_MINOR 0
-#define ROCKSDB_PATCH 1
+#define ROCKSDB_PATCH 2
// Do not use these. We made the mistake of declaring macros starting with
// double underscore. Now we have to live with our choice. We'll deprecate these