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 EFBE8182CC for ; Mon, 29 Jun 2015 14:11:47 +0000 (UTC) Received: (qmail 41476 invoked by uid 500); 29 Jun 2015 14:11:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 41442 invoked by uid 500); 29 Jun 2015 14:11:47 -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 41431 invoked by uid 99); 29 Jun 2015 14:11:47 -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; Mon, 29 Jun 2015 14:11:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D7FFE0547; Mon, 29 Jun 2015 14:11:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Message-Id: <7fa840af5feb4beeb41e03cd6da8ae7a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: BulkLoader has --transport-factory option but does not use it Date: Mon, 29 Jun 2015 14:11:47 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 bafcb3a56 -> f88b62118 BulkLoader has --transport-factory option but does not use it patch by Mike Adamson; reviewed by jasobrown for CASSANDRA-9675 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f88b6211 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f88b6211 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f88b6211 Branch: refs/heads/cassandra-2.2 Commit: f88b62118dd9d3f08bc079bc15165fae01519537 Parents: bafcb3a Author: Jason Brown Authored: Mon Jun 29 07:10:53 2015 -0700 Committer: Jason Brown Committed: Mon Jun 29 07:10:53 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f88b6211/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e58d524..fe71ea7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2 + * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675) * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) * Update cqlsh for UDFs (CASSANDRA-7556) * Change Windows kernel default timer resolution (CASSANDRA-9634) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f88b6211/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 51e5e3d..73194a1 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -24,7 +24,6 @@ import java.net.MalformedURLException; import java.net.UnknownHostException; import java.util.*; -import com.google.common.base.Optional; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import org.apache.commons.cli.*; @@ -53,8 +52,6 @@ public class BulkLoader private static final String PASSWD_OPTION = "password"; private static final String THROTTLE_MBITS = "throttle"; - private static final String TRANSPORT_FACTORY = "transport-factory"; - /* client encryption options */ private static final String SSL_TRUSTSTORE = "truststore"; private static final String SSL_TRUSTSTORE_PW = "truststore-password"; @@ -516,7 +513,6 @@ public class BulkLoader options.addOption("t", THROTTLE_MBITS, "throttle", "throttle speed in Mbits (default unlimited)"); options.addOption("u", USER_OPTION, "username", "username for cassandra authentication"); options.addOption("pw", PASSWD_OPTION, "password", "password for cassandra authentication"); - options.addOption("tf", TRANSPORT_FACTORY, "transport factory", "Fully-qualified ITransportFactory class name for creating a connection to cassandra"); options.addOption("cph", CONNECTIONS_PER_HOST, "connectionsPerHost", "number of concurrent connections-per-host."); // ssl connection-related options options.addOption("ts", SSL_TRUSTSTORE, "TRUSTSTORE", "Client SSL: full path to truststore");