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

Merge branch 'cassandra-1.2' into cassandra-2.0 

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/ByteBufferUtil.java
This commit is contained in:
Sylvain Lebresne 2014-07-02 10:29:10 +02:00
parent 4112a7fa27 04250f2e5c
commit 34252003bf
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* Fix AssertionError when using empty clustering columns and static columns
(CASSANDRA-7455)
* Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
Merged from 1.2:
2.0.9