Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgebay committed Oct 17, 2016
1 parent 31add95 commit 2ff16b9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# ChangeLog - DataStax C# Driver

## 3.1.0

2016-10-17

### Merged from 3.0 branch:

#### Bug Fixes

- [CSHARP-483] - Request timeout but driver log and net-trace shows the server responds promptly
- [CSHARP-492] - Mapper: Include keyspace name when defined in mappings
- [CSHARP-493] - Connection: Reading while cancelling all in-flight requests can result in NullReferenceException
- [CSHARP-500] - Concurrent calls to OperationState.SetCompleted() can result in deadlock

## 3.0.9

2016-09-29
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ You can use Visual Studio or msbuild to build the solution.
[Check the documentation for building the driver from source and running the tests](https://github.com/datastax/csharp-driver/wiki/Building-and-running-tests).

## License
Copyright 2012-2015, DataStax.
Copyright 2012-2016, DataStax.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -224,7 +224,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

[apidocs]: http://docs.datastax.com/en/latest-csharp-driver-api/html/N_Cassandra.htm
[apidocs]: http://docs.datastax.com/en/drivers/csharp/3.1/
[docindex]: http://datastax.github.io/csharp-driver/features/
[features]: http://datastax.github.io/csharp-driver/features/
[getting-started]: http://planetcassandra.org/getting-started-with-apache-cassandra-and-net/
Expand Down
2 changes: 1 addition & 1 deletion src/Cassandra/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.1.0-beta1",
"version": "3.1.0",
"name": "Cassandra",
"authors": [ "DataStax" ],
"title": "DataStax C# Driver for Apache Cassandra",
Expand Down

0 comments on commit 2ff16b9

Please sign in to comment.