Merge branch 'cassandra-2.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.2
Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cfb17f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cfb17f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cfb17f4 Branch: refs/heads/trunk Commit: 4cfb17f48ea88465b39e7eb762985cda172e1fb3 Parents: 23d7a55 6f93bd1 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jun 2 08:43:15 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jun 2 08:43:15 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../CustomPayloadMirroringQueryHandler.java | 18 +++-- .../org/apache/cassandra/cql3/QueryHandler.java | 20 ++++-- .../apache/cassandra/cql3/QueryProcessor.java | 22 ++++-- .../io/sstable/SSTableIdentityIterator.java | 10 +++ .../io/sstable/format/SSTableReader.java | 57 +++++++++++---- .../org/apache/cassandra/transport/CBUtil.java | 18 ++--- .../org/apache/cassandra/transport/Message.java | 13 ++-- .../compaction/BlacklistingCompactionsTest.java | 17 +++-- .../cassandra/transport/MessagePayloadTest.java | 73 ++++++++++++-------- 10 files changed, 177 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cfb17f4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 41f5cfb,db94c76..42846d7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ 2.2 + * Clean up gossiper logic for old versions (CASSANDRA-9370) + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) * ant test-all results incomplete when parsed (CASSANDRA-9463) * Disallow frozen<> types in function arguments and return types for clarity (CASSANDRA-9411)