[1/2] cassandra git commit: Fix 2.2 CHANGES.txt
Repository: cassandra Updated Branches: refs/heads/trunk f7d15d6af -> bade0fb1a Fix 2.2 CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/678291a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/678291a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/678291a7 Branch: refs/heads/trunk Commit: 678291a750e9a0c412957fbb87ce9aeb98e7e673 Parents: 889c187 Author: Aleksey Yeschenko Authored: Tue May 19 16:48:56 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue May 19 16:48:56 2015 +0300 -- CHANGES.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678291a7/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7885e0e..2ffd6ed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +2.2 +Merged from 2.1: + * Use configured gcgs in anticompaction (CASSANDRA-9397) + + 2.2.0-beta1 * Introduce Transactional API for internal state changes (CASSANDRA-8984) * Add a flag in cassandra.yaml to enable UDFs (CASSANDRA-9404) @@ -114,7 +119,6 @@ 2.1.6 - * Use configured gcgs in anticompaction (CASSANDRA-9397) * Warn on misuse of unlogged batches (CASSANDRA-9282) * Failure detector detects and ignores local pauses (CASSANDRA-9183) * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029)
cassandra git commit: Fix 2.2 CHANGES.txt
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 889c1872e -> 678291a75 Fix 2.2 CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/678291a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/678291a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/678291a7 Branch: refs/heads/cassandra-2.2 Commit: 678291a750e9a0c412957fbb87ce9aeb98e7e673 Parents: 889c187 Author: Aleksey Yeschenko Authored: Tue May 19 16:48:56 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue May 19 16:48:56 2015 +0300 -- CHANGES.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678291a7/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7885e0e..2ffd6ed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +2.2 +Merged from 2.1: + * Use configured gcgs in anticompaction (CASSANDRA-9397) + + 2.2.0-beta1 * Introduce Transactional API for internal state changes (CASSANDRA-8984) * Add a flag in cassandra.yaml to enable UDFs (CASSANDRA-9404) @@ -114,7 +119,6 @@ 2.1.6 - * Use configured gcgs in anticompaction (CASSANDRA-9397) * Warn on misuse of unlogged batches (CASSANDRA-9282) * Failure detector detects and ignores local pauses (CASSANDRA-9183) * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029)