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/eaf7d81e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaf7d81e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaf7d81e Branch: refs/heads/trunk Commit: eaf7d81e7af89033ca8dcd3605b12076c3ec1757 Parents: 6ed3c19 e4eba25 Author: Robert Stupp <[email protected]> Authored: Wed May 20 08:49:25 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Wed May 20 08:49:25 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/native_protocol_v4.spec | 6 - .../apache/cassandra/service/QueryState.java | 10 +- .../apache/cassandra/tracing/TraceState.java | 42 +--- .../org/apache/cassandra/tracing/Tracing.java | 24 +-- .../apache/cassandra/transport/Connection.java | 9 - .../org/apache/cassandra/transport/Event.java | 54 ----- .../org/apache/cassandra/transport/Server.java | 5 - .../transport/messages/BatchMessage.java | 2 +- .../transport/messages/ExecuteMessage.java | 2 +- .../transport/messages/PrepareMessage.java | 2 +- .../transport/messages/QueryMessage.java | 2 +- .../cassandra/tracing/TraceCompleteTest.java | 204 ------------------- 13 files changed, 19 insertions(+), 344 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaf7d81e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9954948,a227f5e..5642cd4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,10 @@@ +3.0: + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + 2.2 * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) Merged from 2.1: * Use configured gcgs in anticompaction (CASSANDRA-9397)
