Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae2daea5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae2daea5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae2daea5 Branch: refs/heads/trunk Commit: ae2daea52456bd460663d7aecff9180810063834 Parents: f90207c 6f93bd1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jun 2 15:35:37 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jun 2 15:35:37 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../CustomPayloadMirroringQueryHandler.java | 18 +++-- .../org/apache/cassandra/cql3/QueryHandler.java | 20 ++++-- .../apache/cassandra/cql3/QueryProcessor.java | 22 ++++-- .../org/apache/cassandra/transport/CBUtil.java | 18 ++--- .../org/apache/cassandra/transport/Message.java | 13 ++-- .../cassandra/transport/MessagePayloadTest.java | 73 ++++++++++++-------- 7 files changed, 110 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae2daea5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 59bdadc,db94c76..474476f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.0: + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + + 2.2 + * 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)
