You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/05/19 15:49:07 UTC
[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 <al...@apache.org>
Authored: Tue May 19 16:48:56 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
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)
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by al...@apache.org.
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/bade0fb1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bade0fb1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bade0fb1
Branch: refs/heads/trunk
Commit: bade0fb1a234d3f8355ab293347704ebcecc8ae3
Parents: f7d15d6 678291a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue May 19 16:49:46 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue May 19 16:49:46 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------