From 2e98ac018f8e1d886c75ecc2268e8a52f685bf39 Mon Sep 17 00:00:00 2001 From: sdong Date: Tue, 18 Jul 2017 12:54:12 -0700 Subject: [PATCH] Bump up version to 5.5.5, update HISTORY.md and one more cleaning up --- HISTORY.md | 4 ++++ build_tools/make_new_version.sh | 6 +++--- include/rocksdb/version.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index ccef3d77..a89b548d 100644 --- 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 edcb36c1..a3b643d4 100755 --- 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 99a0428c..fe3483f6 100644 --- 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 -- 2.47.3