cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 18 Aug 2017 17:20:27 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: 8378bfc510265f46e76f0030bf17e340f82a8041
Parents: 0614b27 9b6fd54
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri Aug 18 19:18:57 2017 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri Aug 18 19:18:57 2017 +0200

----------------------------------------------------------------------
 build.xml  | 4 +++-
 circle.yml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8378bfc5/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8378bfc5/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index a51cf25,a6a8b98..eefb5f9
--- a/circle.yml
+++ b/circle.yml
@@@ -7,7 -7,7 +7,7 @@@ test
      - sudo apt-get update; sudo apt-get install wamerican:
          parallel: true
    override:
-     - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test -Dtest.runners=1;; 1)
ant long-test ;; 2) ant test-compression ;;esac:
 -    - case $CIRCLE_NODE_INDEX in 0) ant test ;; 1) ant long-test ;; 2) ant test-compression
;; 3) ant eclipse-warnings ;;esac:
++    - case $CIRCLE_NODE_INDEX in 0) ant test -Dtest.runners=1 ;; 1) ant long-test ;; 2)
ant test-compression ;; 3) ant eclipse-warnings ;;esac:
          parallel: true
  
    post:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message