Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a5f79eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a5f79eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a5f79eb
Branch: refs/heads/cassandra-2.1
Commit: 3a5f79eb5856c714a94a05c17409221fd3ace1b0
Parents: 136abcc 2bf63f6
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Jan 23 09:15:03 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Jan 23 09:15:03 2015 -0600
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 18 ++++++++++++++++--
.../org/apache/cassandra/tools/SSTableExport.java | 2 +-
.../org/apache/cassandra/tools/SSTableImport.java | 2 +-
.../cassandra/tools/StandaloneScrubber.java | 2 +-
.../cassandra/tools/StandaloneSplitter.java | 2 +-
.../cassandra/tools/StandaloneUpgrader.java | 2 +-
6 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java
index bdbebc1,3135fe6..87d52be
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@@ -501,7 -540,12 +501,7 @@@ public class SSTableImpor
isSorted = true;
}
- DatabaseDescriptor.loadSchemas();
- if (cmd.hasOption(OLD_SC_FORMAT_OPTION))
- {
- oldSCFormat = true;
- }
-
+ DatabaseDescriptor.loadSchemas(false);
if (Schema.instance.getNonSystemKeyspaces().size() < 1)
{
String msg = "no non-system keyspaces are defined";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
----------------------------------------------------------------------
