From fafe4bf5e71af184582244552923a7a062c6144b Mon Sep 17 00:00:00 2001 From: Michael Fero Date: Tue, 17 Mar 2020 13:06:37 -0400 Subject: [PATCH] Preparing for 2.15.1 release * Updating version * Updating changelog * Updating dependency versions * Updating default server versions * Adding missing documentation for CentOS 8 --- CHANGELOG.md | 20 ++++++++++++++++++++ README.md | 2 ++ appveyor.yml | 2 +- build.yaml | 2 +- docs.yaml | 2 +- include/cassandra.h | 2 +- tests/src/integration/ccm/bridge.hpp | 4 ++-- tests/src/integration/options.cpp | 4 ++-- topics/README.md | 4 ++++ topics/building/README.md | 12 ++++++++---- topics/installation/README.md | 10 +++++++++- 11 files changed, 51 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ae429def..3a93e95d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +2.15.1 +=========== + +Bug Fixes +-------- +* [CPP-747] Cannot connect to keyspace with uppercase characters +* [CPP-897] Simplify CMake build +* [CPP-913] Possible for a token map replica set for a given range to have duplicates +* [CPP-914] Possible for a WaitForHandler's on_set() method to be called after timeout/error + +Other +-------- +* [CPP-847] Add CentOS 8 support +* [CPP-889] Duplicated entry for the DSE features documentation + +Community +-------- +* Fix cflags when build with CASS_INSTALL_HEADER_IN_SUBDIR on (remicollet) +* Fix typo in RequestProcessorInitializer::internal_initialize (m8mble) + 2.15.0 =========== diff --git a/README.md b/README.md index dc8afd4a8..256e3b287 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ distribution: * [CentOS 6][centos-6-dependencies] * [CentOS 7][centos-7-dependencies] +* [CentOS 8][centos-8-dependencies] * [Ubuntu 14.04][ubuntu-14-04-dependencies] * [Ubuntu 16.04][ubuntu-16-04-dependencies] * [Ubuntu 18.04][ubuntu-18-04-dependencies] @@ -221,6 +222,7 @@ specific language governing permissions and limitations under the License. [Provide your input]: http://goo.gl/forms/ihKC5uEQr6 [centos-6-dependencies]: http://downloads.datastax.com/cpp-driver/centos/6/dependencies [centos-7-dependencies]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies +[centos-8-dependencies]: http://downloads.datastax.com/cpp-driver/centos/8/dependencies [ubuntu-14-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies [ubuntu-16-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies [ubuntu-18-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies diff --git a/appveyor.yml b/appveyor.yml index 7a886d4ca..182998954 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,7 +37,7 @@ environment: APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true DRIVER_TYPE: CASS LIBSSH2_VERSION: 1.9.0 - LIBUV_VERSION: 1.34.0 + LIBUV_VERSION: 1.35.0 OPENSSL_1_0_VERSION: 1.0.2u OPENSSL_1_1_VERSION: 1.1.1d ZLIB_VERSION: 1.2.11 diff --git a/build.yaml b/build.yaml index 2869b4277..e2a5d8815 100644 --- a/build.yaml +++ b/build.yaml @@ -36,7 +36,7 @@ os: - centos/8-64/cpp - osx/high-sierra env: - LIBUV_VERSION: 1.34.0 + LIBUV_VERSION: 1.35.0 build: - script: | . .build.sh diff --git a/docs.yaml b/docs.yaml index 6dc499b84..2f36cdae8 100644 --- a/docs.yaml +++ b/docs.yaml @@ -69,7 +69,7 @@ rules: versions: - name: "2.15" - ref: 2.15.0 + ref: 2.15.1 - name: "2.14" ref: 2.14.0 - name: "2.13" diff --git a/include/cassandra.h b/include/cassandra.h index 40c5b81ff..500419150 100644 --- a/include/cassandra.h +++ b/include/cassandra.h @@ -53,7 +53,7 @@ #define CASS_VERSION_MAJOR 2 #define CASS_VERSION_MINOR 15 -#define CASS_VERSION_PATCH 0 +#define CASS_VERSION_PATCH 1 #define CASS_VERSION_SUFFIX "" #ifdef __cplusplus diff --git a/tests/src/integration/ccm/bridge.hpp b/tests/src/integration/ccm/bridge.hpp index b8fb45829..7b8257bb7 100644 --- a/tests/src/integration/ccm/bridge.hpp +++ b/tests/src/integration/ccm/bridge.hpp @@ -37,8 +37,8 @@ typedef struct _LIBSSH2_CHANNEL LIBSSH2_CHANNEL; #endif // Default values -#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.4") -#define DEFAULT_DSE_VERSION DseVersion("6.7.5") +#define DEFAULT_CASSANDRA_VERSION CassVersion("3.11.6") +#define DEFAULT_DSE_VERSION DseVersion("6.7.7") #define DEFAULT_USE_GIT false #define DEFAULT_USE_INSTALL_DIR false #define DEFAULT_SERVER_TYPE ServerType(ServerType::CASSANDRA) diff --git a/tests/src/integration/options.cpp b/tests/src/integration/options.cpp index dc0071b56..35c465857 100644 --- a/tests/src/integration/options.cpp +++ b/tests/src/integration/options.cpp @@ -23,8 +23,8 @@ #include #include -#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.4") -#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.7.5") +#define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.6") +#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.7.7") #define DEFAULT_OPTIONS_DDAC_VERSION CCM::DseVersion("5.1.17") // Initialize the defaults for all the options diff --git a/topics/README.md b/topics/README.md index fe5ed9ea8..a47ab0baf 100644 --- a/topics/README.md +++ b/topics/README.md @@ -8,6 +8,7 @@ Packages are available for the following platforms: * [CentOS 6][cpp-driver-centos6] * [CentOS 7][cpp-driver-centos7] +* [CentOS 8][cpp-driver-centos8] * [Ubuntu 14.04 LTS][cpp-driver-ubuntu14-04] * [Ubuntu 16.04 LTS][cpp-driver-ubuntu16-04] * [Ubuntu 18.04 LTS][cpp-driver-ubuntu18-04] @@ -20,6 +21,7 @@ and can be found under the "dependencies" directory for each platform: * [CentOS 6][cpp-driver-dependencies-centos6] * [CentOS 7][cpp-driver-dependencies-centos7] +* [CentOS 8][cpp-driver-dependencies-centos8] * [Ubuntu 14.04 LTS][cpp-driver-dependencies-ubuntu14-04] * [Ubuntu 16.04 LTS][cpp-driver-dependencies-ubuntu16-04] * [Ubuntu 18.04 LTS][cpp-driver-dependencies-ubuntu18-04] @@ -260,12 +262,14 @@ with other drivers. The schedule for these features can be found on [JIRA]. [cpp-driver-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/cassandra [cpp-driver-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/cassandra +[cpp-driver-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/cassandra [cpp-driver-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/cassandra [cpp-driver-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/cassandra [cpp-driver-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra [cpp-driver-windows]: http://downloads.datastax.com/cpp-driver/windows/cassandra [cpp-driver-dependencies-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/dependencies/ [cpp-driver-dependencies-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies/ +[cpp-driver-dependencies-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/dependencies/ [cpp-driver-dependencies-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies/ [cpp-driver-dependencies-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/ [cpp-driver-dependencies-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/ diff --git a/topics/building/README.md b/topics/building/README.md index 923f01ab6..31293c41b 100644 --- a/topics/building/README.md +++ b/topics/building/README.md @@ -6,6 +6,7 @@ available for the following platforms: * [CentOS 6][cpp-driver-centos6] * [CentOS 7][cpp-driver-centos7] +* [CentOS 8][cpp-driver-centos8] * [Ubuntu 14.04 LTS][cpp-driver-ubuntu14-04] * [Ubuntu 16.04 LTS][cpp-driver-ubuntu16-04] * [Ubuntu 18.04 LTS][cpp-driver-ubuntu18-04] @@ -44,7 +45,7 @@ __\*\*\*__ Use the `CASS_USE_ZLIB` CMake option to enable/disable zlib support. ## Linux/Mac OS -The driver is known to build on CentOS/RHEL 6/7, Mac OS X 10.10/10.11 (Yosemite +The driver is known to build on CentOS/RHEL 6/7/8, Mac OS X 10.10/10.11 (Yosemite and El Capitan), Mac OS 10.12/10.13 (Sierra and High Sierra), and Ubuntu 14.04/16.04/18.04 LTS. @@ -106,6 +107,7 @@ Packages are available from our [download server]: * [CentOS 6][libuv-centos6] * [CentOS 7][libuv-centos7] +* [CentOS 8][libuv-centos8] * [Ubuntu 14.04 LTS][libuv-ubuntu14-04] * [Ubuntu 16.04 LTS][libuv-ubuntu16-04] * [Ubuntu 18.04 LTS][libuv-ubuntu18-04] @@ -123,9 +125,9 @@ your system._ ```bash pushd /tmp -wget http://dist.libuv.org/dist/v1.34.0/libuv-v1.34.0.tar.gz -tar xzf libuv-v1.34.0.tar.gz -pushd libuv-v1.34.0 +wget http://dist.libuv.org/dist/v1.34.0/libuv-v1.35.0.tar.gz +tar xzf libuv-v1.35.0.tar.gz +pushd libuv-v1.35.0 sh autogen.sh ./configure make install @@ -330,12 +332,14 @@ cmake -G "Visual Studio 16 2019" -A x64 -DCASS_BUILD_UNIT_TESTS=On .. [download server]: http://downloads.datastax.com [cpp-driver-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/cassandra [cpp-driver-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/cassandra +[cpp-driver-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/cassandra [cpp-driver-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/cassandra [cpp-driver-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/cassandra [cpp-driver-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra [cpp-driver-windows]: http://downloads.datastax.com/cpp-driver/windows/cassandra [libuv-centos6]: http://downloads.datastax.com/cpp-driver/centos/6/dependencies/libuv [libuv-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies/libuv +[libuv-centos8]: http://downloads.datastax.com/cpp-driver/centos/8/dependencies/libuv [libuv-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies/libuv [libuv-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/libuv [libuv-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv diff --git a/topics/installation/README.md b/topics/installation/README.md index e2969c1a3..2bd6b058c 100644 --- a/topics/installation/README.md +++ b/topics/installation/README.md @@ -2,7 +2,7 @@ ## Packages -Pre-built packages are available for CentOS 6/7, Ubuntu 14.04/16.04/18.04 and +Pre-built packages are available for CentOS 6/7/8, Ubuntu 14.04/16.04/18.04 and Windows 7 SP1 and above. ### CentOS @@ -24,6 +24,10 @@ Windows 7 SP1 and above. CentOS 7 http://downloads.datastax.com/cpp-driver/centos/7/cassandra + + CentOS 8 + http://downloads.datastax.com/cpp-driver/centos/8/cassandra + @@ -48,6 +52,10 @@ CentOS doesn't have up-to-date versions of libuv so we provide current packages. CentOS 7 http://downloads.datastax.com/cpp-driver/centos/7/dependencies + + CentOS 8 + http://downloads.datastax.com/cpp-driver/centos/8/dependencies +