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/09/05 15:14:37 UTC
[1/6] git commit: use correct native port in pig-test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3a410175f -> c6b509d75
refs/heads/cassandra-2.1.0 45014886e -> cf76ba3d7
refs/heads/trunk 3f1820f1d -> 33ceddafa
use correct native port in pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf76ba3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf76ba3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf76ba3d
Branch: refs/heads/cassandra-2.1
Commit: cf76ba3d7e7723888a3d00393569f62312ab2703
Parents: 4501488
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:13:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:13:49 2014 -0500
----------------------------------------------------------------------
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ba3d/test/pig/org/apache/cassandra/pig/PigTestBase.java
----------------------------------------------------------------------
diff --git a/test/pig/org/apache/cassandra/pig/PigTestBase.java b/test/pig/org/apache/cassandra/pig/PigTestBase.java
index 002fbba..4b3e422 100644
--- a/test/pig/org/apache/cassandra/pig/PigTestBase.java
+++ b/test/pig/org/apache/cassandra/pig/PigTestBase.java
@@ -68,7 +68,7 @@ public class PigTestBase extends SchemaLoader
protected static String defaultParameters= "init_address=localhost&rpc_port=9170&partitioner=org.apache.cassandra.dht.ByteOrderedPartitioner";
protected static String nativeParameters = "&core_conns=2&max_conns=10&min_simult_reqs=3&max_simult_reqs=10&native_timeout=10000000" +
"&native_read_timeout=10000000&send_buff_size=4096&receive_buff_size=4096&solinger=3" +
- "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9052";
+ "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9042";
static
{
[6/6] 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/33ceddaf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ceddaf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ceddaf
Branch: refs/heads/trunk
Commit: 33ceddafab48e7d3c216dc224bcd63d4b469f911
Parents: 3f1820f c6b509d
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:14:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:14:29 2014 -0500
----------------------------------------------------------------------
test/conf/cassandra.yaml | 2 --
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[2/6] git commit: use correct native port in pig-test
Posted by br...@apache.org.
use correct native port in pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf76ba3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf76ba3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf76ba3d
Branch: refs/heads/cassandra-2.1.0
Commit: cf76ba3d7e7723888a3d00393569f62312ab2703
Parents: 4501488
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:13:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:13:49 2014 -0500
----------------------------------------------------------------------
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ba3d/test/pig/org/apache/cassandra/pig/PigTestBase.java
----------------------------------------------------------------------
diff --git a/test/pig/org/apache/cassandra/pig/PigTestBase.java b/test/pig/org/apache/cassandra/pig/PigTestBase.java
index 002fbba..4b3e422 100644
--- a/test/pig/org/apache/cassandra/pig/PigTestBase.java
+++ b/test/pig/org/apache/cassandra/pig/PigTestBase.java
@@ -68,7 +68,7 @@ public class PigTestBase extends SchemaLoader
protected static String defaultParameters= "init_address=localhost&rpc_port=9170&partitioner=org.apache.cassandra.dht.ByteOrderedPartitioner";
protected static String nativeParameters = "&core_conns=2&max_conns=10&min_simult_reqs=3&max_simult_reqs=10&native_timeout=10000000" +
"&native_read_timeout=10000000&send_buff_size=4096&receive_buff_size=4096&solinger=3" +
- "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9052";
+ "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9042";
static
{
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6b509d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6b509d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6b509d7
Branch: refs/heads/cassandra-2.1
Commit: c6b509d751aeb8aa511bfaecb94af0a080acd426
Parents: 3a41017 cf76ba3
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:14:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:14:17 2014 -0500
----------------------------------------------------------------------
test/conf/cassandra.yaml | 2 --
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6b509d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6b509d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6b509d7
Branch: refs/heads/trunk
Commit: c6b509d751aeb8aa511bfaecb94af0a080acd426
Parents: 3a41017 cf76ba3
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:14:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:14:17 2014 -0500
----------------------------------------------------------------------
test/conf/cassandra.yaml | 2 --
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: use correct native port in pig-test
Posted by br...@apache.org.
use correct native port in pig-test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf76ba3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf76ba3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf76ba3d
Branch: refs/heads/trunk
Commit: cf76ba3d7e7723888a3d00393569f62312ab2703
Parents: 4501488
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 5 08:13:49 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 5 08:13:49 2014 -0500
----------------------------------------------------------------------
test/pig/org/apache/cassandra/pig/PigTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf76ba3d/test/pig/org/apache/cassandra/pig/PigTestBase.java
----------------------------------------------------------------------
diff --git a/test/pig/org/apache/cassandra/pig/PigTestBase.java b/test/pig/org/apache/cassandra/pig/PigTestBase.java
index 002fbba..4b3e422 100644
--- a/test/pig/org/apache/cassandra/pig/PigTestBase.java
+++ b/test/pig/org/apache/cassandra/pig/PigTestBase.java
@@ -68,7 +68,7 @@ public class PigTestBase extends SchemaLoader
protected static String defaultParameters= "init_address=localhost&rpc_port=9170&partitioner=org.apache.cassandra.dht.ByteOrderedPartitioner";
protected static String nativeParameters = "&core_conns=2&max_conns=10&min_simult_reqs=3&max_simult_reqs=10&native_timeout=10000000" +
"&native_read_timeout=10000000&send_buff_size=4096&receive_buff_size=4096&solinger=3" +
- "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9052";
+ "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9042";
static
{