Bump up version to 5.5.5, update HISTORY.md and one more cleaning up

diff --git a/HISTORY.md b/HISTORY.md
index ccef3d778bfc0e2f18e37e2f34efe57069c41a3e..a89b548ddcc9640fadcf481f82868eca86640a4f 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,8 @@
 # Rocksdb Change Log
+## 5.5.5 (07/18/2017)
+* Change license section of java/rocksjni.pom
+* Clear up some files still mentioning PATENTS file 
+
 ## 5.5.4 (07/18/2017)
 * Change License to Apache + GPLv2
 

diff --git a/build_tools/make_new_version.sh b/build_tools/make_new_version.sh
index edcb36c1f9340354e138e712d23b645b9b385725..a3b643d49cd99fc2137a1a307da6d1127597bf21 100755 (executable)
--- a/build_tools/make_new_version.sh
+++ b/build_tools/make_new_version.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-#  This source code is licensed under the BSD-style license found in the
-#  LICENSE file in the root directory of this source tree. An additional grant
-#  of patent rights can be found in the PATENTS file in the same directory.
+#  This source code is licensed under both the GPLv2 (found in the
+#  COPYING file in the root directory) and Apache 2.0 License
+#  (found in the LICENSE.Apache file in the root directory).
 
 set -e
 if [ -z "$GIT" ]

diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 99a0428cd7ae6b90e6ed1c6f886620c3d0337d54..fe3483f6246dbb160e2daee21d2a91432ec08b1d 100644 (file)
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -6,7 +6,7 @@
 
 #define ROCKSDB_MAJOR 5
 #define ROCKSDB_MINOR 5
-#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