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/ad58bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad58bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad58bf7c Branch: refs/heads/trunk Commit: ad58bf7c735897c4cff2db13f3887095e212bdde Parents: f60a201 fdecab0 Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri May 29 10:11:09 2015 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri May 29 10:11:09 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 16 +- .../CassandraBriefJUnitResultFormatter.java | 312 +++++++++++++++ .../CassandraXMLJUnitResultFormatter.java | 380 +++++++++++++++++++ 4 files changed, 702 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad58bf7c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a2b5d9e,dc13bea..9636796 --- 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 + * ant test-all results incomplete when parsed (CASSANDRA-9463) * Disallow frozen<> types in function arguments and return types for clarity (CASSANDRA-9411) * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad58bf7c/build.xml ----------------------------------------------------------------------
