Merge pull request #477 from datastax/v2.15.2

v2.15.2
datastax · May 12, 2020 · d506367 · d506367
2 parents 6875ae3 + 468acca
commit d506367
Show file tree

Hide file tree

Showing 10 changed files with 1,041 additions and 97 deletions.
diff --git a/.build.linux.sh b/.build.linux.sh
@@ -15,7 +15,7 @@
 #  limitations under the License.
 ##
 
-configure_environment() {
+configure_testing_environment() {
   if ! grep -lq "127.254.254.254" /etc/hosts; then
     printf "\n\n%s\n" "127.254.254.254  cpp-driver.hostname." | sudo tee -a /etc/hosts
   fi
@@ -33,7 +33,7 @@ install_libuv() {(
     [[ -d build ]] && rm -rf build
     mkdir build
 
-    if [ "${OS_NAME}" = "ubuntu" ]; then
+    if [ "${OS_DISTRO}" = "ubuntu" ]; then
       ./build_deb.sh ${LIBUV_VERSION}
     else
       ./build_rpm.sh ${LIBUV_VERSION}
@@ -43,7 +43,7 @@ install_libuv() {(
   [[ -d packages ]] || mkdir packages
   find libuv-packaging/build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
 
-  if [ "${OS_NAME}" = "ubuntu" ]; then
+  if [ "${OS_DISTRO}" = "ubuntu" ]; then
     sudo dpkg -i packages/libuv*.deb
   else
     sudo rpm -U --force packages/libuv*.rpm
@@ -66,7 +66,7 @@ install_driver() {(
     [[ -d build ]] && rm -rf build
     mkdir build
 
-    if [ "${OS_NAME}" = "ubuntu" ]; then
+    if [ "${OS_DISTRO}" = "ubuntu" ]; then
       ./build_deb.sh
     else
       ./build_rpm.sh
@@ -76,7 +76,7 @@ install_driver() {(
   [[ -d packages ]] || mkdir packages
   find build -type f \( -name "*.deb" -o -name "*.rpm" \) -exec mv {} packages \;
 
-  if [ "${OS_NAME}" = "ubuntu" ]; then
+  if [ "${OS_DISTRO}" = "ubuntu" ]; then
     sudo dpkg -i packages/*cpp-driver*.deb
   else
     sudo rpm -i packages/*cpp-driver*.rpm

diff --git a/.build.osx.sh b/.build.osx.sh
@@ -15,7 +15,7 @@
 #  limitations under the License.
 ##
 
-configure_environment() {
+configure_testing_environment() {
   true
 }
 

diff --git a/.build.sh b/.build.sh
@@ -20,13 +20,9 @@
 #set -n #Check Syntax
 set -e #Fail fast on non-zero exit status
 
-WORKER_INFORMATION=($(echo ${OS_VERSION} | tr "/" " "))
-OS_NAME=${WORKER_INFORMATION[0]}
-RELEASE=${WORKER_INFORMATION[1]}
-SHA=$(echo ${GIT_COMMIT} | cut -c1-7)
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-if [ "${OS_NAME}" = "osx" ]; then
+
+if [ "${OS_DISTRO}" = "osx" ]; then
   LIB_SUFFIX="dylib"
   PROCS=$(sysctl -n hw.logicalcpu)
   . ${SCRIPT_DIR}/.build.osx.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+2.15.2
+===========
+
+Bug Fixes
+--------
+* [CPP-917] Infinite loop in token map calculation when using SimpleStrategy and RF > number of
+  nodes
+
+Community
+--------
+* Fix compatibility with OpenSSL 1.1 (SeverinLeonhardt)
+
 2.15.1
 ===========