Skip to content

Commit 78d9e0c

Browse files
authored
Merge pull request #229 from riptano/1.8.0_prep
DSE 1.8.0 and OSS 2.12.0 preparation
2 parents e074db5 + 674f125 commit 78d9e0c

32 files changed

+290
-110
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
1.8.0
2+
===========
3+
4+
Features
5+
--------
6+
[CPP-722] Insightful monitoring (Insights) startup message
7+
[CPP-723] Insightful monitoring (Insights) status event message
8+
[CPP-741] Allow user to configure client ID
9+
[CPP-751] Call host listener callback for the initial set of hosts
10+
11+
Bug Fixes
12+
--------
13+
[CPP-755] UDT metadata not being properly populated/updated
14+
15+
Other
16+
--------
17+
[CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
18+
and `allowRemoteDCsForLocalConsistencyLevel `)
19+
[CPP-720] Streamline custom allocator
20+
[CPP-752] Add connection count to Host
21+
122
1.7.0
223
===========
324

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ environment:
4040
APPVEYOR_BUILD_WORKER_CLOUD: gce
4141
APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
4242
DRIVER_TYPE: DSE
43-
BOOST_VERSION: 1.68.0
44-
LIBSSH2_VERSION: 1.8.0
45-
LIBUV_VERSION: 1.24.0
46-
OPENSSL_1_0_VERSION: 1.0.2q
47-
OPENSSL_1_1_VERSION: 1.1.1a
43+
BOOST_VERSION: 1.69.0
44+
LIBSSH2_VERSION: 1.8.2
45+
LIBUV_VERSION: 1.28.0
46+
OPENSSL_1_0_VERSION: 1.0.2r
47+
OPENSSL_1_1_VERSION: 1.1.1b
4848
matrix:
4949
- CMAKE_GENERATOR: Visual Studio 10 2010
5050
OPENSSL_MAJOR_MINOR: 1.0

build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ architecture:
1414
os:
1515
- ubuntu/bionic64/cpp
1616
- ubuntu/trusty64/cpp
17-
- ubuntu/xenial64
18-
- centos/6-64
19-
- centos/7-64
17+
- ubuntu/xenial64/cpp
18+
- centos/6-64/cpp
19+
- centos/7-64/cpp
2020
- osx/high-sierra
2121
env:
22-
LIBUV_VERSION: 1.24.0
22+
LIBUV_VERSION: 1.26.0
2323
build:
2424
- script: |
2525
. ./cpp-driver/.build.sh

cpp-driver/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2.12.0
2+
===========
3+
4+
Features
5+
--------
6+
[CPP-751] Call host listener callback for the initial set of hosts
7+
8+
Bug Fixes
9+
--------
10+
[CPP-755] UDT metadata not being properly populated/updated
11+
12+
Other
13+
--------
14+
[CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
15+
and `allowRemoteDCsForLocalConsistencyLevel `)
16+
[CPP-720] Streamline custom allocator
17+
118
2.11.0
219
===========
320

cpp-driver/appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ environment:
3939
APPVEYOR_BUILD_WORKER_CLOUD: gce
4040
APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
4141
DRIVER_TYPE: CASS
42-
BOOST_VERSION: 1.68.0
43-
LIBSSH2_VERSION: 1.8.0
44-
LIBUV_VERSION: 1.24.0
45-
OPENSSL_1_0_VERSION: 1.0.2q
46-
OPENSSL_1_1_VERSION: 1.1.1a
42+
BOOST_VERSION: 1.69.0
43+
LIBSSH2_VERSION: 1.8.2
44+
LIBUV_VERSION: 1.28.0
45+
OPENSSL_1_0_VERSION: 1.0.2r
46+
OPENSSL_1_1_VERSION: 1.1.1b
4747
matrix:
4848
- CMAKE_GENERATOR: Visual Studio 10 2010
4949
OPENSSL_MAJOR_MINOR: 1.0

cpp-driver/build.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ architecture:
1414
os:
1515
- ubuntu/bionic64/cpp
1616
- ubuntu/trusty64/cpp
17-
- ubuntu/xenial64
18-
- centos/6-64
19-
- centos/7-64
17+
- ubuntu/xenial64/cpp
18+
- centos/6-64/cpp
19+
- centos/7-64/cpp
2020
- osx/high-sierra
2121
env:
22-
LIBUV_VERSION: 1.24.0
22+
LIBUV_VERSION: 1.26.0
2323
build:
2424
- script: |
2525
. .build.sh
@@ -43,6 +43,9 @@ package:
4343
include: # list of files and glob paths to include in the artifact, relative to the current working directory
4444
- packaging/packages/*
4545
release:
46+
matrix:
47+
exclude:
48+
- os: [ osx/high-sierra ]
4649
after:
4750
each:
4851
- script: |

cpp-driver/cmake/modules/ExternalProject-Boost.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(NOT BOOST_INSTALL_PREFIX)
2323
endif()
2424
option(BOOST_VERSION "Boost version to build and install")
2525
if(NOT BOOST_VERSION)
26-
set(BOOST_VERSION "1.68.0")
26+
set(BOOST_VERSION "1.69.0")
2727
endif()
2828
set(BOOST_VERSION ${BOOST_VERSION} CACHE STRING "Boost version to build and install" FORCE)
2929

cpp-driver/cmake/modules/ExternalProject-OpenSSL.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ endif()
2121
# OpenSSL related CMake options
2222
option(OPENSSL_VERSION "OpenSSL version to build and install")
2323
if(NOT OPENSSL_VERSION)
24-
# TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1a)?
25-
set(OPENSSL_VERSION "1.0.2q")
24+
# TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1b)?
25+
set(OPENSSL_VERSION "1.0.2r")
2626
endif()
2727
option(OPENSSL_INSTALL_PREFIX "OpenSSL installation prefix location")
2828
if(CASS_USE_ZLIB)

cpp-driver/cmake/modules/ExternalProject-libssh2.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(NOT LIBSSH2_INSTALL_PREFIX)
2222
endif()
2323
option(LIBSSH2_VERSION "libssh2 version to build and install")
2424
if(NOT LIBSSH2_VERSION)
25-
set(LIBSSH2_VERSION "1.8.0")
25+
set(LIBSSH2_VERSION "1.8.2")
2626
endif()
2727
set(LIBSSH2_VERSION ${LIBSSH2_VERSION} CACHE STRING "libssh2 version to build and install" FORCE)
2828

cpp-driver/cmake/modules/ExternalProject-libuv.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(NOT LIBUV_INSTALL_PREFIX)
2222
endif()
2323
option(LIBUV_VERSION "libuv version to build and install")
2424
if(NOT LIBUV_VERSION)
25-
set(LIBUV_VERSION "1.24.0")
25+
set(LIBUV_VERSION "1.28.0")
2626
endif()
2727
set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
2828

0 commit comments

Comments
 (0)