You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/05/18 15:16:45 UTC
[1/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Repository: cassandra
Updated Branches:
refs/heads/trunk b7ed19059 -> 05e033d97
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a4489df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a4489df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a4489df
Branch: refs/heads/trunk
Commit: 6a4489df3b8549979d517a646bc70723dd859430
Parents: efc57cd 7acd0e6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon May 18 09:25:24 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon May 18 09:25:24 2015 +0100
----------------------------------------------------------------------
.../unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a4489df/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Don't open system ks before scrubbing the
data directory
Posted by ma...@apache.org.
Don't open system ks before scrubbing the data directory
Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-9405
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa133b70
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa133b70
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa133b70
Branch: refs/heads/trunk
Commit: aa133b70fa08039b458c3b5fc295ce3624b8d43d
Parents: 6a4489d
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon May 18 08:47:31 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon May 18 15:14:12 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa133b70/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 9c8d071..b6f233f 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -278,7 +278,7 @@ public class StartupChecks
// check the system keyspace to keep user from shooting self in foot by changing partitioner, cluster name, etc.
// we do a one-off scrub of the system keyspace first; we can't load the list of the rest of the keyspaces,
// until system keyspace is opened.
- Keyspace systemKs = Keyspace.open(SystemKeyspace.NAME);
+
for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(SystemKeyspace.NAME).values())
ColumnFamilyStore.scrubDataDirectories(cfm);
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ma...@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/05e033d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05e033d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05e033d9
Branch: refs/heads/trunk
Commit: 05e033d97592169aeb9d1358f1c6c9a360a8b38c
Parents: b7ed190 aa133b7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon May 18 15:15:05 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon May 18 15:15:05 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------