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/26 01:50:23 UTC
[1/3] git commit: fix nativeMaxSimultReqs
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ef9473a03 -> 3744d7792
refs/heads/trunk aa25f67ea -> f3aa83be1
fix nativeMaxSimultReqs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3744d779
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3744d779
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3744d779
Branch: refs/heads/cassandra-2.1
Commit: 3744d7792941785e6e38fefa2b50b1df5cda8791
Parents: ef9473a
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 18:49:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 18:50:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3744d779/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 51d473e..bcbdb10 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,6 +127,8 @@ public class CqlNativeStorage extends CqlStorage
CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
if (nativeMinSimultReqs != null)
CqlConfigHelper.setInputMinSimultReqPerConnections(conf, nativeMinSimultReqs);
+ if (nativeMaxSimultReqs != null)
+ CqlConfigHelper.setInputMaxSimultReqPerConnections(conf, nativeMaxSimultReqs);
if (nativeConnectionTimeout != null)
CqlConfigHelper.setInputNativeConnectionTimeout(conf, nativeConnectionTimeout);
if (nativeReadConnectionTimeout != null)
[2/3] git commit: fix nativeMaxSimultReqs
Posted by br...@apache.org.
fix nativeMaxSimultReqs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3744d779
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3744d779
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3744d779
Branch: refs/heads/trunk
Commit: 3744d7792941785e6e38fefa2b50b1df5cda8791
Parents: ef9473a
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 18:49:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 18:50:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3744d779/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 51d473e..bcbdb10 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -127,6 +127,8 @@ public class CqlNativeStorage extends CqlStorage
CqlConfigHelper.setInputMaxConnections(conf, nativeMaxConnections);
if (nativeMinSimultReqs != null)
CqlConfigHelper.setInputMinSimultReqPerConnections(conf, nativeMinSimultReqs);
+ if (nativeMaxSimultReqs != 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/f3aa83be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3aa83be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3aa83be
Branch: refs/heads/trunk
Commit: f3aa83be1db07511b77ce534c127568c659ef934
Parents: aa25f67 3744d77
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 18:50:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 18:50:18 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------