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 2013/12/12 19:17:35 UTC
[1/3] git commit: Fix CHANGES.txt
Updated Branches:
refs/heads/trunk 448e4d46f -> d16d5c4f2
Fix CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7c91448
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7c91448
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7c91448
Branch: refs/heads/trunk
Commit: f7c9144852d3d61f998691595d727c24dea65a85
Parents: 79f7d6b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 21:14:29 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 21:14:56 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7c91448/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa48a27..b7bbe09 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.14
+ * Randomize batchlog candidates selection (CASSANDRA-6481)
+
+
1.2.13
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
* Optimize FD phi calculation (CASSANDRA-6386)
@@ -16,7 +20,6 @@
(CASSANDRA-6413)
* (Hadoop) add describe_local_ring (CASSANDRA-6268)
* Fix handling of concurrent directory creation failure (CASSANDRA-6459)
- * Randomize batchlog candidates selection (CASSANDRA-6481)
1.2.12
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d16d5c4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d16d5c4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d16d5c4f
Branch: refs/heads/trunk
Commit: d16d5c4f2992c6b36f5afe02a856d8eabc87eee9
Parents: 448e4d4 e6eb550
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 21:17:24 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 21:17:24 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6eb5506
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6eb5506
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6eb5506
Branch: refs/heads/trunk
Commit: e6eb5506ae82cf7f6558e3b39fccbb3a7b90cce0
Parents: ca7335e f7c9144
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 21:16:53 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 21:16:53 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------