Repository: cassandra Updated Branches: refs/heads/trunk 1e8533a31 -> 7bdb2dddc
Fix leftover merge conflicts in build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bdb2ddd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bdb2ddd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bdb2ddd Branch: refs/heads/trunk Commit: 7bdb2dddcbc608543604eebedf6fe4a9f6d9858a Parents: 1e8533a Author: Tyler Hobbs <[email protected]> Authored: Wed Aug 17 17:33:28 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Aug 17 17:33:28 2016 -0500 ---------------------------------------------------------------------- build.xml | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bdb2ddd/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 8ae42b8..df6d469 100644 --- a/build.xml +++ b/build.xml @@ -1492,11 +1492,7 @@ </target> <target name="test-all" -<<<<<<< HEAD depends="eclipse-warnings,test,long-test,test-compression,stress-test" -======= - depends="eclipse-warnings,test,long-test,test-compression" ->>>>>>> cassandra-3.9 description="Run all tests except for those under test-burn" /> <!-- Use JaCoCo ant extension without needing externally saved lib -->
