You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/08/14 15:46:58 UTC

[01/10] cassandra git commit: Wait 10s instead of 1s for connections to be closed on StreamingTransferTest

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 91f7387e1 -> 315356c1d
  refs/heads/cassandra-3.0 5fdb90e12 -> 74ac3cef1
  refs/heads/cassandra-3.9 d597910b2 -> 903ac4d4f
  refs/heads/trunk 00a62814a -> 2143805ee


Wait 10s instead of 1s for connections to be closed on StreamingTransferTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/315356c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/315356c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/315356c1

Branch: refs/heads/cassandra-2.2
Commit: 315356c1de7e4d7db5e0f159daebe9a528a8e04d
Parents: 91f7387
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 10:57:29 2016 -0300
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:42:58 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/315356c1/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 2b16267..0af76c2 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -255,7 +255,7 @@ public class StreamingTransferTest
     {
         //after stream session is finished, message handlers may take several milliseconds to be closed
         outer:
-        for (int i = 0; i <= 10; i++)
+        for (int i = 0; i <= 100; i++)
         {
             for (MessagingService.SocketThread socketThread : MessagingService.instance().getSocketThreads())
                 if (!socketThread.connections.isEmpty())


[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74ac3cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74ac3cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74ac3cef

Branch: refs/heads/cassandra-3.9
Commit: 74ac3cef1068d46046560b4bf80fd1f47a439510
Parents: 5fdb90e 315356c
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:44:04 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:44:32 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74ac3cef/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


[03/10] cassandra git commit: Wait 10s instead of 1s for connections to be closed on StreamingTransferTest

Posted by ja...@apache.org.
Wait 10s instead of 1s for connections to be closed on StreamingTransferTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/315356c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/315356c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/315356c1

Branch: refs/heads/cassandra-3.9
Commit: 315356c1de7e4d7db5e0f159daebe9a528a8e04d
Parents: 91f7387
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 10:57:29 2016 -0300
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:42:58 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/315356c1/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 2b16267..0af76c2 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -255,7 +255,7 @@ public class StreamingTransferTest
     {
         //after stream session is finished, message handlers may take several milliseconds to be closed
         outer:
-        for (int i = 0; i <= 10; i++)
+        for (int i = 0; i <= 100; i++)
         {
             for (MessagingService.SocketThread socketThread : MessagingService.instance().getSocketThreads())
                 if (!socketThread.connections.isEmpty())


[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74ac3cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74ac3cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74ac3cef

Branch: refs/heads/cassandra-3.0
Commit: 74ac3cef1068d46046560b4bf80fd1f47a439510
Parents: 5fdb90e 315356c
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:44:04 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:44:32 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74ac3cef/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/903ac4d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/903ac4d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/903ac4d4

Branch: refs/heads/cassandra-3.9
Commit: 903ac4d4f0944c17e6ec923ffd4cdcaee65eee8d
Parents: d597910 74ac3ce
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:45:15 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:45:25 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/903ac4d4/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


[10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

Posted by ja...@apache.org.
Merge branch 'cassandra-3.9' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2143805e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2143805e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2143805e

Branch: refs/heads/trunk
Commit: 2143805eef1fc93d9cd53f4415158e469c473730
Parents: 00a6281 903ac4d
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:45:46 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:45:58 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74ac3cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74ac3cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74ac3cef

Branch: refs/heads/trunk
Commit: 74ac3cef1068d46046560b4bf80fd1f47a439510
Parents: 5fdb90e 315356c
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:44:04 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:44:32 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74ac3cef/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


[04/10] cassandra git commit: Wait 10s instead of 1s for connections to be closed on StreamingTransferTest

Posted by ja...@apache.org.
Wait 10s instead of 1s for connections to be closed on StreamingTransferTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/315356c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/315356c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/315356c1

Branch: refs/heads/trunk
Commit: 315356c1de7e4d7db5e0f159daebe9a528a8e04d
Parents: 91f7387
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 10:57:29 2016 -0300
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:42:58 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/315356c1/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 2b16267..0af76c2 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -255,7 +255,7 @@ public class StreamingTransferTest
     {
         //after stream session is finished, message handlers may take several milliseconds to be closed
         outer:
-        for (int i = 0; i <= 10; i++)
+        for (int i = 0; i <= 100; i++)
         {
             for (MessagingService.SocketThread socketThread : MessagingService.instance().getSocketThreads())
                 if (!socketThread.connections.isEmpty())


[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/903ac4d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/903ac4d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/903ac4d4

Branch: refs/heads/trunk
Commit: 903ac4d4f0944c17e6ec923ffd4cdcaee65eee8d
Parents: d597910 74ac3ce
Author: Jason Brown <ja...@gmail.com>
Authored: Sun Aug 14 08:45:15 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:45:25 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/903ac4d4/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


[02/10] cassandra git commit: Wait 10s instead of 1s for connections to be closed on StreamingTransferTest

Posted by ja...@apache.org.
Wait 10s instead of 1s for connections to be closed on StreamingTransferTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/315356c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/315356c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/315356c1

Branch: refs/heads/cassandra-3.0
Commit: 315356c1de7e4d7db5e0f159daebe9a528a8e04d
Parents: 91f7387
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 10:57:29 2016 -0300
Committer: Jason Brown <ja...@gmail.com>
Committed: Sun Aug 14 08:42:58 2016 -0700

----------------------------------------------------------------------
 .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/315356c1/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 2b16267..0af76c2 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -255,7 +255,7 @@ public class StreamingTransferTest
     {
         //after stream session is finished, message handlers may take several milliseconds to be closed
         outer:
-        for (int i = 0; i <= 10; i++)
+        for (int i = 0; i <= 100; i++)
         {
             for (MessagingService.SocketThread socketThread : MessagingService.instance().getSocketThreads())
                 if (!socketThread.connections.isEmpty())