You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/01/31 13:28:41 UTC

[1/2] git commit: Fix typo in changelog

Updated Branches:
  refs/heads/cassandra-2.0 9d70cf3b9 -> f6a7a5be5


Fix typo in changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df86e8fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df86e8fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df86e8fb

Branch: refs/heads/cassandra-2.0
Commit: df86e8fb10d191280ece762bbe6294ccef6ad48d
Parents: 4cb045a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 13:28:08 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 13:28:08 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df86e8fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d85d3a4..68bed3b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,7 @@
  * Add ability to throttle batchlog replay (CASSANDRA-6550)
  * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
  * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
- * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6598)
  * Paginate batchlog replay (CASSANDRA-6569)
  * skip blocking on streaming during drain (CASSANDRA-6603)
  * Improve error message when schema doesn't match loaded sstable (CASSANDRA-6262)

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6a7a5be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6a7a5be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6a7a5be

Branch: refs/heads/cassandra-2.0
Commit: f6a7a5be533ad39fe5af72fb2f1287b9c9d73bad
Parents: 9d70cf3 df86e8f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 13:28:26 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 13:28:26 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6a7a5be/CHANGES.txt
----------------------------------------------------------------------