Skip to content

Commit 056bb02

Browse files
author
Michael Fero
committed
Preparing for 2.15.0 (unified driver) release
1 parent 6d997ae commit 056bb02

File tree

10 files changed

+19
-21
lines changed

10 files changed

+19
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2.15.0-alpha
1+
2.15.0
22
===========
33

44
Features

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DataStax C/C++ Driver for Apache Cassandra and DataStax Products
22

3-
A modern, feature-rich] and highly tunable C/C++ client library for
3+
A modern, feature-rich and highly tunable C/C++ client library for
44
[Apache Cassandra] 2.1+ using exclusively Cassandra's binary protocol and
55
Cassandra Query Language v3. This driver can also be used with other DataStax
66
products:

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ environment:
3737
APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
3838
DRIVER_TYPE: CASS
3939
LIBSSH2_VERSION: 1.9.0
40-
LIBUV_VERSION: 1.33.0
41-
OPENSSL_1_0_VERSION: 1.0.2s
42-
OPENSSL_1_1_VERSION: 1.1.1c
40+
LIBUV_VERSION: 1.34.0
41+
OPENSSL_1_0_VERSION: 1.0.2u
42+
OPENSSL_1_1_VERSION: 1.1.1d
4343
ZLIB_VERSION: 1.2.11
4444
matrix:
4545
- CMAKE_GENERATOR: Visual Studio 10 2010

build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ os:
3535
- centos/7-64/cpp
3636
- osx/high-sierra
3737
env:
38-
LIBUV_VERSION: 1.33.0
38+
LIBUV_VERSION: 1.34.0
3939
build:
4040
- script: |
4141
. .build.sh

docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ versions:
6969
- name: "2.15"
7070
ref: 2.15.0
7171
- name: "2.14"
72-
ref: 2.14.0
72+
ref: 2.14.1
7373
- name: "2.13"
7474
ref: 2.13.0
7575
- name: "2.12"

include/cassandra.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#define CASS_VERSION_MAJOR 2
5555
#define CASS_VERSION_MINOR 15
5656
#define CASS_VERSION_PATCH 0
57-
#define CASS_VERSION_SUFFIX "alpha"
57+
#define CASS_VERSION_SUFFIX ""
5858

5959
#ifdef __cplusplus
6060
extern "C" {

topics/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ with other drivers. The schedule for these features can be found on [JIRA].
268268
[cpp-driver-dependencies-centos7]: http://downloads.datastax.com/cpp-driver/centos/7/dependencies/
269269
[cpp-driver-dependencies-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/14.04/dependencies/
270270
[cpp-driver-dependencies-ubuntu16-04]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies/
271-
[cpp-driver-dependencies-ubuntu14-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/
271+
[cpp-driver-dependencies-ubuntu18-04]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/
272272
[cpp-driver-dependencies-windows]: http://downloads.datastax.com/cpp-driver/windows/dependencies/
273273
[built from source]: http://datastax.github.io/cpp-driver/topics/building/
274274
[prepared statements]: http://datastax.github.io/cpp-driver/topics/basics/prepared_statements/

topics/building/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ your system._
117117

118118
```bash
119119
pushd /tmp
120-
wget http://dist.libuv.org/dist/v1.33.0/libuv-v1.33.0.tar.gz
121-
tar xzf libuv-v1.33.0.tar.gz
122-
pushd libuv-v1.33.0
120+
wget http://dist.libuv.org/dist/v1.34.0/libuv-v1.34.0.tar.gz
121+
tar xzf libuv-v1.34.0.tar.gz
122+
pushd libuv-v1.34.0
123123
sh autogen.sh
124124
./configure
125125
make install
@@ -159,9 +159,9 @@ brew link --force openssl
159159

160160
```bash
161161
pushd /tmp
162-
wget --no-check-certificate https://www.openssl.org/source/openssl-1.0.2s.tar.gz
163-
tar xzf openssl-1.0.2s.tar.gz
164-
pushd openssl-1.0.2s
162+
wget --no-check-certificate https://www.openssl.org/source/openssl-1.0.2u.tar.gz
163+
tar xzf openssl-1.0.2u.tar.gz
164+
pushd openssl-1.0.2u
165165
CFLAGS=-fpic ./config shared
166166
make
167167
make install

topics/cloud/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
## Connecting to your [DataStax Apollo database on Constellation] using a secure connection bundle
44

5-
**Note:** Both the C++ Driver for Apache Cassandra and the C++ Driver for DataStax
6-
Enterprise (DSE) use the same code to connect and query your Cassandra database,
7-
but when using the DSE driver use the header `#include <dse.h>`.
8-
95
Use the following code snippet to connect your database:
106

117
```c
12-
#include <cassandra.h> /* Use "#include <dse.h>" when using the C++ DSE Driver */
8+
#include <cassandra.h>
139
#include <stdio.h>
1410

1511
int main(int argc, char* argv[]) {

topics/installation/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Kerberos) on Windows because they can be difficult to install/build.
196196

197197
#### To Install
198198

199-
First, you will need to download and install [Kerberos for Windows].
199+
First, you will need to download and install [Kerberos] for Windows.
200200

201201
Unzip the packages (from http://downloads.datastax.com) and add the include and
202202
library directories to your project's `Additional Include Directories` and
@@ -208,3 +208,5 @@ If pre-built packages are not available for your platform or architecture you
208208
will need to build the driver from source. Directions for building and
209209
installing the DataStax C/C++ Driver for Apache Cassandra and DataStax Products
210210
can be found [here](/topics/building/).
211+
212+
[Kerberos]: https://web.mit.edu/kerberos

0 commit comments

Comments
 (0)