Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion include/cassandra.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion topics/basics/prepared_statements/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down