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:47 UTC
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
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>