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:
Dave Brosius 2015-01-09 19:59:14 -05:00
parent c6525da86e e9061922da
commit fa0cc90393
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -146,7 +146,7 @@ Merged from 2.0:
* Improve PropertyFileSnitch logging (CASSANDRA-8183)
* Add DC-aware sequential repair (CASSANDRA-8193)
* Use live sstables in snapshot repair if possible (CASSANDRA-8312)
* Fix hints serialized size calculation (CASSANDRA-8587)
2.1.2
* (cqlsh) parse_for_table_meta errors out on queries with undefined

4
src/java/org/apache/cassandra/net/MessageOut.java
View File

@ -131,8 +131,8 @@ public class MessageOut<T>
size += TypeSizes.NATIVE.sizeof(parameters.size());
for (Map.Entry<String, byte[]> entry : parameters.entrySet())
{
TypeSizes.NATIVE.sizeof(entry.getKey());
TypeSizes.NATIVE.sizeof(entry.getValue().length);
size += TypeSizes.NATIVE.sizeof(entry.getKey());
size += TypeSizes.NATIVE.sizeof(entry.getValue().length);
size += entry.getValue().length;
}