You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/12/02 22:32:51 UTC

[1/3] cassandra git commit: Increase unit test timeout from 1m to 4m

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 a9a2d75b2 -> d7068fd72


Increase unit test timeout from 1m to 4m

The new timeout matches what we've been using in CI for some time now.


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

Branch: refs/heads/cassandra-3.0
Commit: b85da71961076d9c205f6d08155a3269a257d4bd
Parents: a6619e5
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Dec 2 15:31:10 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Dec 2 15:31:10 2015 -0600

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b85da719/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4bbbe69..e73a7b0 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@
     <property name="maven-repository-url" value="https://repository.apache.org/content/repositories/snapshots"/>
     <property name="maven-repository-id" value="apache.snapshots.https"/>
 
-    <property name="test.timeout" value="60000" />
+    <property name="test.timeout" value="240000" />
     <property name="test.long.timeout" value="600000" />
     <property name="test.burn.timeout" value="600000" />
 


[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: e491f05b71437b47a2d7ed72c2d680188148332a
Parents: 1604535 b85da71
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Dec 2 15:32:16 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Dec 2 15:32:16 2015 -0600

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e491f05b/build.xml
----------------------------------------------------------------------


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

Posted by ty...@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/d7068fd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7068fd7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7068fd7

Branch: refs/heads/cassandra-3.0
Commit: d7068fd72e4597112dc91011da87d58bdb9c0c3b
Parents: a9a2d75 e491f05
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Dec 2 15:32:40 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Dec 2 15:32:40 2015 -0600

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7068fd7/build.xml
----------------------------------------------------------------------