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/f210b177 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f210b177 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f210b177 Branch: refs/heads/cassandra-3.11 Commit: f210b1776b8cfc881c49869ebc51040440906e66 Parents: 4b52a68 0ffce2e Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Aug 30 13:36:03 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Aug 30 13:36:36 2017 +0200 ---------------------------------------------------------------------- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f210b177/circle.yml ---------------------------------------------------------------------- diff --cc circle.yml index a6a8b98,0c3f86b..02a1664 --- a/circle.yml +++ b/circle.yml @@@ -13,6 -13,6 +13,6 @@@ test post: - mkdir -p $CIRCLE_TEST_REPORTS/junit/: parallel: true - - find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;: - - case $CIRCLE_NODE_INDEX in [0123]) find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac: ++ - case $CIRCLE_NODE_INDEX in [012]) find ./build/test/output/ -iname "*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac: parallel: true --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
