Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/trunk
Commit: f679b6fc3bcc194c941abced6a5bac6642cd2fa1
Parents: 771ad53 d981309
Author: Marcus Eriksson <marc...@apache.org>
Authored: Wed Aug 30 13:37:06 2017 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Wed Aug 30 13:37:40 2017 +0200

----------------------------------------------------------------------
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f679b6fc/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index f4801b7,fa5d25a8..ae848aa
--- 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 [012]) find ./build/test/output/ -iname 
"*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; ;;esac:
++    - case $CIRCLE_NODE_INDEX in [0123]) 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

Reply via email to