natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Tyler Hobbs 2014-07-10 16:25:39 -05:00
parent 0b89ae2601 5207cfa59e
commit 93a6625378
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -28,6 +28,9 @@
Merged from 2.0:
* Warn when SSL certificates have expired (CASSANDRA-7528)
* Fix error when doing reversed queries with static columns (CASSANDRA-7490)
Merged from 1.2:
* Set correct stream ID on responses when non-Exception Throwables
are thrown while handling native protocol messages (CASSANDRA-7470)
2.1.0-rc3
@ -71,6 +74,7 @@ Merged from 2.0:
* Fix exception when querying a composite-keyed table with a collection index
(CASSANDRA-7372)
* Use node's host id in place of counter ids (CASSANDRA-7366)
* Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
* Fix native protocol CAS batches (CASSANDRA-7337)
* Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
* Upgrade to Pig 0.12.1 (CASSANDRA-6556)