cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 01 Mar 2017 02:06:46 GMT
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 <aweisberg@apple.com>
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg <aweisberg@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>


Mime
View raw message