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/418aefdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418aefdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/418aefdd Branch: refs/heads/trunk Commit: 418aefdd292242277635aed818a9097a7576abe0 Parents: 2e48b6a 76b5f30 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed May 20 20:03:32 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed May 20 20:03:32 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/RangeTombstone.java | 4 ++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/418aefdd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1912372,281d10b..4ee25ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -6,7 -1,10 +6,9 @@@ 2.2 * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) - * Add ability to stop compaction by ID (CASSANDRA-7207) Merged from 2.1: + 2.1.6 + * Optimize range tombstone memory footprint (CASSANDRA-8603) * Use configured gcgs in anticompaction (CASSANDRA-9397)
