You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/24 18:49:22 UTC
[1/3] git commit: remove errant code block
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 90b3acadc -> 7f571b57a
refs/heads/trunk 7cb78e12f -> ae93155c7
remove errant code block
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f571b57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f571b57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f571b57
Branch: refs/heads/cassandra-2.1
Commit: 7f571b57abe6e93493a1406a582d5b0ababc0118
Parents: 90b3aca
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 24 11:48:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 24 11:48:55 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f571b57/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 68249f9..51d473e 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,8 +127,6 @@ public class CqlNativeStorage extends CqlStorage
CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
if (nativeMinSimultReqs != null)
CqlConfigHelper.setInputMinSimultReqPerConnections(conf, nativeMinSimultReqs);
- if (nativeMinSimultReqs != null)
- CqlConfigHelper.setInputMaxSimultReqPerConnections(conf, nativeMaxSimultReqs);
if (nativeConnectionTimeout != null)
CqlConfigHelper.setInputNativeConnectionTimeout(conf, nativeConnectionTimeout);
if (nativeReadConnectionTimeout != null)
[2/3] git commit: remove errant code block
Posted by br...@apache.org.
remove errant code block
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f571b57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f571b57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f571b57
Branch: refs/heads/trunk
Commit: 7f571b57abe6e93493a1406a582d5b0ababc0118
Parents: 90b3aca
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 24 11:48:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 24 11:48:55 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f571b57/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 68249f9..51d473e 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,8 +127,6 @@ public class CqlNativeStorage extends CqlStorage
CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
if (nativeMinSimultReqs != null)
CqlConfigHelper.setInputMinSimultReqPerConnections(conf, nativeMinSimultReqs);
- if (nativeMinSimultReqs != null)
- CqlConfigHelper.setInputMaxSimultReqPerConnections(conf, nativeMaxSimultReqs);
if (nativeConnectionTimeout != null)
CqlConfigHelper.setInputNativeConnectionTimeout(conf, nativeConnectionTimeout);
if (nativeReadConnectionTimeout != null)
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae93155c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae93155c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae93155c
Branch: refs/heads/trunk
Commit: ae93155c76aa3c04f34717859998c855727b59f3
Parents: 7cb78e1 7f571b5
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 24 11:49:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 24 11:49:05 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------