You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2017/08/18 17:20:18 UTC
[01/15] cassandra git commit: CASSANDRA-13775 followup - use 4
containers still
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3c0c4620f -> a3498d5eb
refs/heads/cassandra-2.2 830b01272 -> 9b6fd54a4
refs/heads/cassandra-3.0 0614b274f -> 8378bfc51
refs/heads/cassandra-3.11 76e9e632e -> 01f2855b4
refs/heads/trunk 22c86f7bc -> b76a48b61
CASSANDRA-13775 followup - use 4 containers still
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3498d5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3498d5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3498d5e
Branch: refs/heads/cassandra-2.1
Commit: a3498d5eb7b5b5418b32491238524b33f20347dd
Parents: 3c0c462
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 15:10:28 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:15:46 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/a3498d5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index eb2266d..e5ab405 100644
--- a/build.xml
+++ b/build.xml
@@ -1164,9 +1164,11 @@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3498d5e/circle.yml
----------------------------------------------------------------------
diff --git a/circle.yml b/circle.yml
index 5b4c72d..f4db279 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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 ;; 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 test-clientutil-jar ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a
Branch: refs/heads/cassandra-3.0
Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681
Parents: 830b012 a3498d5
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:16:56 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:16:56 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/9b6fd54a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ea71e6e,e5ab405..38c7d24
--- a/build.xml
+++ b/build.xml
@@@ -1275,11 -1164,11 +1275,13 @@@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <!-- Note that the test pass without that next line, but it prints an ugly error message -->
+ <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index 5b4c72d,f4db279..a6a8b98
--- 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 ;; 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 test-clientutil-jar ;;esac:
++ - case $CIRCLE_NODE_INDEX in 0) ant test ;; 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
[03/15] cassandra git commit: CASSANDRA-13775 followup - use 4
containers still
Posted by ma...@apache.org.
CASSANDRA-13775 followup - use 4 containers still
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3498d5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3498d5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3498d5e
Branch: refs/heads/trunk
Commit: a3498d5eb7b5b5418b32491238524b33f20347dd
Parents: 3c0c462
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 15:10:28 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:15:46 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/a3498d5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index eb2266d..e5ab405 100644
--- a/build.xml
+++ b/build.xml
@@ -1164,9 +1164,11 @@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3498d5e/circle.yml
----------------------------------------------------------------------
diff --git a/circle.yml b/circle.yml
index 5b4c72d..f4db279 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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 ;; 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 test-clientutil-jar ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cassandra-3.0
Commit: 8378bfc510265f46e76f0030bf17e340f82a8041
Parents: 0614b27 9b6fd54
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:18:57 2017 +0200
Committer: Marcus Eriksson <ma...@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
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a
Branch: refs/heads/trunk
Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681
Parents: 830b012 a3498d5
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:16:56 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:16:56 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/9b6fd54a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ea71e6e,e5ab405..38c7d24
--- a/build.xml
+++ b/build.xml
@@@ -1275,11 -1164,11 +1275,13 @@@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <!-- Note that the test pass without that next line, but it prints an ugly error message -->
+ <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index 5b4c72d,f4db279..a6a8b98
--- 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 ;; 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 test-clientutil-jar ;;esac:
++ - case $CIRCLE_NODE_INDEX in 0) ant test ;; 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
[04/15] cassandra git commit: CASSANDRA-13775 followup - use 4
containers still
Posted by ma...@apache.org.
CASSANDRA-13775 followup - use 4 containers still
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3498d5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3498d5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3498d5e
Branch: refs/heads/cassandra-3.0
Commit: a3498d5eb7b5b5418b32491238524b33f20347dd
Parents: 3c0c462
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 15:10:28 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:15:46 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/a3498d5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index eb2266d..e5ab405 100644
--- a/build.xml
+++ b/build.xml
@@ -1164,9 +1164,11 @@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3498d5e/circle.yml
----------------------------------------------------------------------
diff --git a/circle.yml b/circle.yml
index 5b4c72d..f4db279 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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 ;; 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 test-clientutil-jar ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
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/01f2855b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01f2855b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01f2855b
Branch: refs/heads/cassandra-3.11
Commit: 01f2855b478413f3b8593aee86157c46a9bff666
Parents: 76e9e63 8378bfc
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:19:31 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:19:31 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a
Branch: refs/heads/cassandra-3.11
Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681
Parents: 830b012 a3498d5
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:16:56 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:16:56 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/9b6fd54a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ea71e6e,e5ab405..38c7d24
--- a/build.xml
+++ b/build.xml
@@@ -1275,11 -1164,11 +1275,13 @@@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <!-- Note that the test pass without that next line, but it prints an ugly error message -->
+ <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index 5b4c72d,f4db279..a6a8b98
--- 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 ;; 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 test-clientutil-jar ;;esac:
++ - case $CIRCLE_NODE_INDEX in 0) ant test ;; 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
[05/15] cassandra git commit: CASSANDRA-13775 followup - use 4
containers still
Posted by ma...@apache.org.
CASSANDRA-13775 followup - use 4 containers still
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3498d5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3498d5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3498d5e
Branch: refs/heads/cassandra-3.11
Commit: a3498d5eb7b5b5418b32491238524b33f20347dd
Parents: 3c0c462
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 15:10:28 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:15:46 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/a3498d5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index eb2266d..e5ab405 100644
--- a/build.xml
+++ b/build.xml
@@ -1164,9 +1164,11 @@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3498d5e/circle.yml
----------------------------------------------------------------------
diff --git a/circle.yml b/circle.yml
index 5b4c72d..f4db279 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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 ;; 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 test-clientutil-jar ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[15/15] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ma...@apache.org.
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/b76a48b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b76a48b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b76a48b6
Branch: refs/heads/trunk
Commit: b76a48b61f284efa9ba514e2c296b96654cb1a93
Parents: 22c86f7 01f2855
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:19:41 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:19:41 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b6fd54a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6fd54a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6fd54a
Branch: refs/heads/cassandra-2.2
Commit: 9b6fd54a4e3f90c468b4c36a5ad3b88239094681
Parents: 830b012 a3498d5
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:16:56 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:16:56 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/9b6fd54a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ea71e6e,e5ab405..38c7d24
--- a/build.xml
+++ b/build.xml
@@@ -1275,11 -1164,11 +1275,13 @@@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+ <!-- Note that the test pass without that next line, but it prints an ugly error message -->
+ <jvmarg value="-Djava.library.path=${build.lib}/sigar-bin"/>
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6fd54a/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index 5b4c72d,f4db279..a6a8b98
--- 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 ;; 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 test-clientutil-jar ;;esac:
++ - case $CIRCLE_NODE_INDEX in 0) ant test ;; 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
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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/cassandra-3.11
Commit: 8378bfc510265f46e76f0030bf17e340f82a8041
Parents: 0614b27 9b6fd54
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:18:57 2017 +0200
Committer: Marcus Eriksson <ma...@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
[02/15] cassandra git commit: CASSANDRA-13775 followup - use 4
containers still
Posted by ma...@apache.org.
CASSANDRA-13775 followup - use 4 containers still
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3498d5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3498d5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3498d5e
Branch: refs/heads/cassandra-2.2
Commit: a3498d5eb7b5b5418b32491238524b33f20347dd
Parents: 3c0c462
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 15:10:28 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:15:46 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/a3498d5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index eb2266d..e5ab405 100644
--- a/build.xml
+++ b/build.xml
@@ -1164,9 +1164,11 @@
classpath which only contains what we expect users to need.
-->
<target name="test-clientutil-jar" depends="build-test,jar" description="Test clientutil jar">
+ <mkdir dir="${build.test.dir}/output"/>
<junit fork="on" forkmode="perTest" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
- <test name="org.apache.cassandra.serializers.ClientUtilsTest" />
+ <test name="org.apache.cassandra.serializers.ClientUtilsTest" todir="${build.test.dir}/output"/>
<formatter type="brief" usefile="false" />
+ <formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${test.classes}" />
<pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3498d5e/circle.yml
----------------------------------------------------------------------
diff --git a/circle.yml b/circle.yml
index 5b4c72d..f4db279 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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 ;; 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 test-clientutil-jar ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
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/01f2855b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01f2855b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01f2855b
Branch: refs/heads/trunk
Commit: 01f2855b478413f3b8593aee86157c46a9bff666
Parents: 76e9e63 8378bfc
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Aug 18 19:19:31 2017 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Aug 18 19:19:31 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
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 <ma...@apache.org>
Authored: Fri Aug 18 19:18:57 2017 +0200
Committer: Marcus Eriksson <ma...@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