You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/03/01 02:06:40 UTC
[01/10] cassandra git commit: Fix "multiple versions of ant
detected..." when running ant test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3748bf7c2 -> aa66c999a
refs/heads/cassandra-3.0 df28bcfaa -> 56d3f9324
refs/heads/cassandra-3.11 91c8d9157 -> 760d6c33d
refs/heads/trunk 895e6ce11 -> 4bb5ada53
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-2.2
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:43:06 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
<classpath>
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by aw...@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/4bb5ada5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb5ada5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb5ada5
Branch: refs/heads/trunk
Commit: 4bb5ada5358cb4287f445d9d49145e76f2bf3a07
Parents: 895e6ce 760d6c3
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:57:57 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:57:57 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 8fde61b,dcaa780..e2bbe94
--- a/build.xml
+++ b/build.xml
@@@ -1057,8 -1198,8 +1059,8 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
- source="${source.version}"
+ source="${source.version}"
target="${target.version}"
encoding="utf-8">
<classpath>
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by aw...@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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/trunk
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:49:52 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
-
- <path id="cobertura.classpath">
- <pathelement location="${cobertura.classes.dir}"/>
- </path>
<macrodef name="create-javadoc">
<attribute name="destdir"/>
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by aw...@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/760d6c33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760d6c33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760d6c33
Branch: refs/heads/cassandra-3.11
Commit: 760d6c33d5727d94e89afb2e43d551f10a2721b7
Parents: 91c8d91 56d3f93
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:54:59 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:54:59 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1cced71,a63bd12..497f5c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,4 +1,15 @@@
-3.0.12
+3.11.0
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+Merged from 3.0:
++ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
* Faster StreamingHistogram (CASSANDRA-13038)
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0eef700,69b6bdf..dcaa780
--- a/build.xml
+++ b/build.xml
@@@ -156,12 -153,14 +156,14 @@@
<pathelement location="${build.classes.main}" />
<pathelement location="${build.classes.thrift}" />
<fileset dir="${build.lib}">
- <include name="**/*.jar" />
- <exclude name="**/*-sources.jar"/>
- <exclude name="**/ant-*.jar"/>
+ <include name="**/*.jar" />
+ <exclude name="**/*-sources.jar"/>
++ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
- <include name="**/*.jar" />
- <exclude name="**/*-sources.jar"/>
- <exclude name="**/ant-*.jar"/>
+ <include name="**/*.jar" />
+ <exclude name="**/*-sources.jar"/>
++ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by aw...@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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/cassandra-3.0
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:49:52 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
-
- <path id="cobertura.classpath">
- <pathelement location="${cobertura.classes.dir}"/>
- </path>
<macrodef name="create-javadoc">
<attribute name="destdir"/>
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>
[04/10] cassandra git commit: Fix "multiple versions of ant
detected..." when running ant test
Posted by aw...@apache.org.
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/trunk
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:43:06 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
<classpath>
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by aw...@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/760d6c33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760d6c33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760d6c33
Branch: refs/heads/trunk
Commit: 760d6c33d5727d94e89afb2e43d551f10a2721b7
Parents: 91c8d91 56d3f93
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:54:59 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:54:59 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1cced71,a63bd12..497f5c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,4 +1,15 @@@
-3.0.12
+3.11.0
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+Merged from 3.0:
++ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
* Faster StreamingHistogram (CASSANDRA-13038)
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0eef700,69b6bdf..dcaa780
--- a/build.xml
+++ b/build.xml
@@@ -156,12 -153,14 +156,14 @@@
<pathelement location="${build.classes.main}" />
<pathelement location="${build.classes.thrift}" />
<fileset dir="${build.lib}">
- <include name="**/*.jar" />
- <exclude name="**/*-sources.jar"/>
- <exclude name="**/ant-*.jar"/>
+ <include name="**/*.jar" />
+ <exclude name="**/*-sources.jar"/>
++ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
- <include name="**/*.jar" />
- <exclude name="**/*-sources.jar"/>
- <exclude name="**/ant-*.jar"/>
+ <include name="**/*.jar" />
+ <exclude name="**/*-sources.jar"/>
++ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
[03/10] cassandra git commit: Fix "multiple versions of ant
detected..." when running ant test
Posted by aw...@apache.org.
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-3.11
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:43:06 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
<classpath>
[02/10] cassandra git commit: Fix "multiple versions of ant
detected..." when running ant test
Posted by aw...@apache.org.
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-3.0
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:43:06 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
<classpath>
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by aw...@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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/cassandra-3.11
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:49:52 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
-
- <path id="cobertura.classpath">
- <pathelement location="${cobertura.classes.dir}"/>
- </path>
<macrodef name="create-javadoc">
<attribute name="destdir"/>
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>