From ffaae81c5a6de043ae80b5fd5af96407135a8527 Mon Sep 17 00:00:00 2001 From: Michael Penick Date: Thu, 16 Jun 2016 14:02:41 -0700 Subject: [PATCH 1/3] Updates for the 2.4.2 release --- CHANGELOG.md | 14 ++++++++++++++ include/cassandra.h | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5183f984..5d5a33589 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +2.4.2 +=========== +June 24, 2016 + +Features +-------- +* Added the per-request timeouts to statement and batch +* Added the ability to remove custom payload items + +Other +-------- +* Fixed issue where cass_date_time_to_epoch() unable to handle dates before + Cassandra date epoch (value: 2147483648) + 2.4.1 =========== June 9, 2016 diff --git a/include/cassandra.h b/include/cassandra.h index 0a10ddfdc..99333edb0 100644 --- a/include/cassandra.h +++ b/include/cassandra.h @@ -52,7 +52,7 @@ #define CASS_VERSION_MAJOR 2 #define CASS_VERSION_MINOR 4 -#define CASS_VERSION_PATCH 1 +#define CASS_VERSION_PATCH 2 #define CASS_VERSION_SUFFIX "" #ifdef __cplusplus From f3c3f20b485450452cbb24edccb82a8380872ee7 Mon Sep 17 00:00:00 2001 From: Michael Fero Date: Mon, 20 Jun 2016 11:03:37 -0400 Subject: [PATCH 2/3] test: Disable metrics/meter unit tests on Windows CI (unstable test) --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 882f45d62..c3e9c10f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ environment: BOOST_VERSION: 1.59.0 LIBSSH2_VERSION: 1.7.0 LIBUV_VERSION: 1.8.0 - OPENSSL_VERSION: 1.0.2f + OPENSSL_VERSION: 1.0.2h DOWNLOADS_URL_PREFIX: http://downloads.datastax.com/cpp-driver/windows/dependencies TEST_DEPENDENCIES_DOWNLOAD_URL_PREFIX: https://raw.githubusercontent.com/mikefero/cpp-driver-msvc-libs/master DEPENDENCIES_LOCATION_PREFIX: C:/projects/dependencies/libs @@ -183,7 +183,7 @@ after_build: Push-AppveyorArtifact build/test/unit_tests/$env:CONFIGURATION/cassandra_unit_tests.exe -DeploymentName "DataStax C/C++ Driver Unit Tests" test_script: - - ps: Start-Process -FilePath "build/test/unit_tests/$env:CONFIGURATION/cassandra_unit_tests.exe" -ArgumentList "--log_format=XML --log_sink=unit_tests-boost-results.xml --log_level=test_suite --report_level=no" -Wait -NoNewWindow + - ps: Start-Process -FilePath "build/test/unit_tests/$env:CONFIGURATION/cassandra_unit_tests.exe" -ArgumentList "--run_test=!metrics/meter* --log_format=XML --log_sink=unit_tests-boost-results.xml --log_level=test_suite --report_level=no" -Wait -NoNewWindow on_finish: - ps: | From 4b397de2eedafdea890285d6b12040ca484e9132 Mon Sep 17 00:00:00 2001 From: Michael Fero Date: Wed, 22 Jun 2016 13:23:32 +0000 Subject: [PATCH 3/3] doc: Correcting variable name in example [ci skip] --- topics/basics/prepared_statements/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topics/basics/prepared_statements/README.md b/topics/basics/prepared_statements/README.md index 1c763d144..2887715a1 100644 --- a/topics/basics/prepared_statements/README.md +++ b/topics/basics/prepared_statements/README.md @@ -19,7 +19,7 @@ if (rc != CASS_OK) { } /* Get the prepared object from the future */ -const CassPrepared* prepared = cass_future_get_prepared(prepared_future); +const CassPrepared* prepared = cass_future_get_prepared(prepare_future); /* The future can be freed immediately after getting the prepared object */ cass_future_free(prepare_future);