| commit | dd79571f5130c2623c1c7b8eea4b6a0cf9497661 | [log] [tgz] |
|---|---|---|
| author | Jonathan Ellis <jbellis@apache.org> | Tue Sep 18 09:57:25 2012 -0500 |
| committer | Jonathan Ellis <jbellis@apache.org> | Tue Sep 18 09:57:25 2012 -0500 |
| tree | 2882b0e7b49c7491ca35593a6e59922dbf452a62 | |
| parent | 0ea28c858e3f693dc44d38cd4306e02049d01ce8 [diff] | |
| parent | e6326e9fd85fca0e81adb04b0405cb7db1b51ac6 [diff] |
Merge branch 'cassandra-1.1' into trunk
diff --git a/build.xml b/build.xml index 5fd88bd..118d3d6 100644 --- a/build.xml +++ b/build.xml
@@ -84,7 +84,7 @@ <property name="maven-repository-id" value="apache.snapshots.https"/> <property name="test.timeout" value="60000" /> - <property name="test.long.timeout" value="300000" /> + <property name="test.long.timeout" value="600000" /> <!-- http://cobertura.sourceforge.net/ --> <property name="cobertura.version" value="1.9.4.1"/>