Return-Path: <commits-return-196376-archive-asf-public=cust-asf.ponee.io@cassandra.apache.org>
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 9E92B200CA8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 15 Jun 2017 16:31:37 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 9D3DB160BED; Thu, 15 Jun 2017 14:31:37 +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 E173D160BC4
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 15 Jun 2017 16:31:36 +0200 (CEST)
Received: (qmail 54477 invoked by uid 500); 15 Jun 2017 14:31:36 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 54454 invoked by uid 99); 15 Jun 2017 14:31:36 -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; Thu, 15 Jun 2017 14:31:36 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 2BF2DE1863; Thu, 15 Jun 2017 14:31:35 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jasobrown@apache.org
To: commits@cassandra.apache.org
Date: Thu, 15 Jun 2017 14:31:37 -0000
Message-Id: <df14d56e18b345ecac643785e8a1b555@git.apache.org>
In-Reply-To: <a16ee0a349354bea8eb3442ffb2efc7f@git.apache.org>
References: <a16ee0a349354bea8eb3442ffb2efc7f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
archived-at: Thu, 15 Jun 2017 14:31:37 -0000

Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: f5531e12060b225ff9c0b2bb58222154a7f08692
Parents: 74e3f15 3f725c9
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Thu Jun 15 07:30:16 2017 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Thu Jun 15 07:30:46 2017 -0700

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5531e12/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d085495,3b2f0ce..64872f8
--- a/build.xml
+++ b/build.xml
@@@ -1253,8 -1392,8 +1253,8 @@@
        <jvmarg value="-Dcassandra.skip_sync=true" />
      </testmacro>
    </target>
 -    
 +
-   <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
+   <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled">
      <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
      <concat destfile="${compressed_yaml}">
        <fileset file="${test.conf}/cassandra.yaml"/>


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