Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8F184200CED for ; Fri, 18 Aug 2017 19:20:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8D9FC169B4F; Fri, 18 Aug 2017 17:20:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D848E169AFE for ; Fri, 18 Aug 2017 19:20:21 +0200 (CEST) Received: (qmail 90833 invoked by uid 500); 18 Aug 2017 17:20:20 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 90321 invoked by uid 99); 18 Aug 2017 17:20:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Aug 2017 17:20:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D888F5586; Fri, 18 Aug 2017 17:20:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Fri, 18 Aug 2017 17:20:27 -0000 Message-Id: <22e9751e385c48ca94aeffe2a0ab7fbc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Fri, 18 Aug 2017 17:20:22 -0000 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 Authored: Fri Aug 18 19:18:57 2017 +0200 Committer: Marcus Eriksson 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