Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d2684a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d2684a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d2684a Branch: refs/heads/trunk Commit: b9d2684a89339e0290fb5db51bfb2c551f150e59 Parents: 8571fb5 eb4032e Author: Jason Brown <[email protected]> Authored: Tue Jul 8 16:22:26 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Tue Jul 8 16:22:26 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/ActiveRepairService.java | 22 +++++++++++--------- .../cassandra/service/StorageService.java | 5 ++++- 3 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9d2684a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9e84d31,7fff2d4..b3d8a4c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,6 +1,13 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + + 2.1.0-final * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) 2.1.0-rc3
