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/09/08 19:56:15 UTC
[1/2] cassandra git commit: Set test.timeout back to 60 seconds
Repository: cassandra
Updated Branches:
refs/heads/trunk 0a6fa11b3 -> b81942267
Set test.timeout back to 60 seconds
Patch by Michael Schuler; reviewed by Tyler Hobbs for CASSANDRA-10284
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f961e84a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f961e84a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f961e84a
Branch: refs/heads/trunk
Commit: f961e84aa6fc139d7227e96b562e76ab857aaad0
Parents: 62b6d8c
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Sep 8 12:54:25 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Sep 8 12:54:25 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f961e84a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6048e27..c2b0496 100644
--- a/build.xml
+++ b/build.xml
@@ -94,7 +94,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="1200000" />
+ <property name="test.timeout" value="60000" />
<property name="test.long.timeout" value="600000" />
<property name="test.burn.timeout" value="600000" />
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8194226
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8194226
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8194226
Branch: refs/heads/trunk
Commit: b8194226736a9222080a1593b2973ada243ee8dc
Parents: 0a6fa11 f961e84
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Sep 8 12:55:57 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Sep 8 12:55:57 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------