cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Thu, 15 Jun 2017 14:31:37 GMT
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


Mime
View raw message