You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/04/11 23:44:24 UTC
[1/3] git commit: Fix ticket number in CHANGES
Repository: cassandra
Updated Branches:
refs/heads/trunk 8c0aa9927 -> f04b775dc
Fix ticket number in CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/294c0116
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/294c0116
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/294c0116
Branch: refs/heads/trunk
Commit: 294c0116d94682e3a6ad6f5778475fa047f2aca0
Parents: 8845c51
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Apr 11 16:43:06 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Apr 11 16:43:06 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/294c0116/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9edd705..451d046 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,10 +63,10 @@ Merged from 1.2:
2.0.6
* Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
- * Pool CqlRecordWriter clients by inetaddress rather than Range
+ * Pool CqlRecordWriter clients by inetaddress rather than Range
(CASSANDRA-6665)
* Fix compaction_history timestamps (CASSANDRA-6784)
- * Compare scores of full replica ordering in DES (CASSANDRA-6883)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6683)
* fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.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/7232783b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7232783b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7232783b
Branch: refs/heads/trunk
Commit: 7232783bc5ab7134c1698d866ceb9cca330d0441
Parents: 3f00662 294c011
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Apr 11 16:43:41 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Apr 11 16:43:41 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7232783b/CHANGES.txt
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f04b775d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f04b775d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f04b775d
Branch: refs/heads/trunk
Commit: f04b775dc8c0ecf93b2f63eeb69142452cfa3c1c
Parents: 8c0aa99 7232783
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Apr 11 16:44:11 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Apr 11 16:44:11 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f04b775d/CHANGES.txt
----------------------------------------------------------------------