Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2F6117966 for ; Fri, 23 Jan 2015 15:28:15 +0000 (UTC) Received: (qmail 11470 invoked by uid 500); 23 Jan 2015 15:28:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11359 invoked by uid 500); 23 Jan 2015 15:28:15 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 11167 invoked by uid 99); 23 Jan 2015 15:28:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 15:28:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82DC8E04A7; Fri, 23 Jan 2015 15:28:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 23 Jan 2015 15:28:18 -0000 Message-Id: <79c595927e5f49488219b1aa84b01603@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 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 Authored: Fri Jan 23 09:15:03 2015 -0600 Committer: Yuki Morishita 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 ----------------------------------------------------------------------