From 5a4b8005a79228b02db1c44f58e148238587408e Mon Sep 17 00:00:00 2001
From: Yanqin Jin <yanqin@fb.com>
Date: Thu, 23 Jul 2020 14:42:25 -0700
Subject: [PATCH] Update HISTORY and version

---
 HISTORY.md                | 4 ++++
 include/rocksdb/version.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index fd68c1409..b1380c181 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,8 @@
 # Rocksdb Change Log
+## 6.11.5 (7/23/2020)
+### Bug Fixes
+* Memtable lookup should report unrecognized value_type as corruption (#7121).
+
 ## 6.11.4 (7/15/2020)
 ### Bug Fixes
 * Make compaction report InternalKey corruption while iterating over the input.
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index fc324ef8e..bf974d5b9 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 6
 #define ROCKSDB_MINOR 11
-#define ROCKSDB_PATCH 4
+#define ROCKSDB_PATCH 5
 
 // 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