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.0' into cassandra-2.1 

Conflicts:
	CHANGES.txt
This commit is contained in:
Aleksey Yeschenko 2014-06-06 01:11:36 +03:00
parent 029cd40317 c54958a9d4
commit 54b241858c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -13,7 +13,7 @@ Merged from 2.0:
* Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
* Fix infinite loop on exception while streaming (CASSANDRA-7330)
Merged from 1.2:
* Fix rare potential NPE in HHOM page size calculation (CASSANDRA-7354)
* Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)