[1/2] cassandra git commit: BulkLoader has --transport-factory option but does not use it
Repository: cassandra
Updated Branches:
refs/heads/trunk e211008d5 -> 5c31a8633
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/trunk
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");
cassandra git commit: BulkLoader has --transport-factory option but does not use it
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");
