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/04/21 20:27:57 UTC
[01/15] cassandra git commit: Set javac encoding to utf-8
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3dfc78449 -> 572fef8a0
refs/heads/cassandra-2.2 31590f5da -> cba5c7fa8
refs/heads/cassandra-3.0 f5b36f12d -> d079ce015
refs/heads/cassandra-3.11 4d24958dd -> ba9beea9d
refs/heads/trunk 9308159bc -> 049ba2d4d
Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572fef8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572fef8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572fef8a
Branch: refs/heads/cassandra-2.1
Commit: 572fef8a06172bd925c478ec16540e8e28e84bd7
Parents: 3dfc784
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 14:21:32 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:15:42 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eacd275..2517432 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.18
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Log stacktrace of uncaught exceptions (CASSANDRA-13108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index da42975..6d64025 100644
--- a/build.xml
+++ b/build.xml
@@ -708,6 +708,7 @@
<!-- Order matters! -->
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/>
@@ -715,6 +716,7 @@
</javac>
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${build.src.java}"/>
@@ -739,7 +741,7 @@
</path>
<target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" />
- <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+ <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@@ -1072,6 +1074,7 @@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
includeantruntime="false"
source="${source.version}"
[03/15] cassandra git commit: Set javac encoding to utf-8
Posted by aw...@apache.org.
Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572fef8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572fef8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572fef8a
Branch: refs/heads/trunk
Commit: 572fef8a06172bd925c478ec16540e8e28e84bd7
Parents: 3dfc784
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 14:21:32 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:15:42 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eacd275..2517432 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.18
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Log stacktrace of uncaught exceptions (CASSANDRA-13108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index da42975..6d64025 100644
--- a/build.xml
+++ b/build.xml
@@ -708,6 +708,7 @@
<!-- Order matters! -->
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/>
@@ -715,6 +716,7 @@
</javac>
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${build.src.java}"/>
@@ -739,7 +741,7 @@
</path>
<target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" />
- <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+ <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@@ -1072,6 +1074,7 @@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
includeantruntime="false"
source="${source.version}"
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by aw...@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/cba5c7fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba5c7fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba5c7fa
Branch: refs/heads/cassandra-2.2
Commit: cba5c7fa8b3d2889ef41bfbf98c9efa1a354dc29
Parents: 31590f5 572fef8
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:16:33 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:18:59 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c24ad,2517432..6ffddc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,11 +1,62 @@@
-2.1.18
+2.2.10
+ * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric paths (CASSANDRA-13103)
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
+ * Discard in-flight shadow round responses (CASSANDRA-12653)
+ * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
+ * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
+ * Fix queries updating multiple time the same list (CASSANDRA-13130)
+ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
+ * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886)
+ * 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)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
+Merged from 2.1:
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
* Remove unused repositories (CASSANDRA-13278)
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+
-2.1.17
+2.2.9
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+ * Fix speculative retry bugs (CASSANDRA-13009)
+ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
+ * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
+ * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
+ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
+ * Fix Util.spinAssertEquals (CASSANDRA-12283)
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
+ * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813)
+ * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)
+ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
+ * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)
+ * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457)
+ * Fix merkle tree depth calculation (CASSANDRA-12580)
+ * Make Collections deserialization more robust (CASSANDRA-12618)
+ * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+Merged from 2.1:
* Use portable stderr for java error in startup (CASSANDRA-13211)
* Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
* Coalescing strategy can enter infinite loop (CASSANDRA-13159)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 867afa4,6d64025..dc5aecb
--- a/build.xml
+++ b/build.xml
@@@ -1177,19 -1074,17 +1179,20 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
- <classpath>
+ <classpath>
<path refid="cassandra.classpath"/>
- </classpath>
- <src path="${test.unit.src}"/>
- <src path="${test.long.src}"/>
- <src path="${test.pig.src}"/>
+ </classpath>
+ <compilerarg value="-XDignore.symbol.file"/>
+ <src path="${test.unit.src}"/>
+ <src path="${test.long.src}"/>
+ <src path="${test.burn.src}"/>
+ <src path="${test.pig.src}"/>
+ <src path="${test.microbench.src}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
[10/15] 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/d079ce01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d079ce01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d079ce01
Branch: refs/heads/trunk
Commit: d079ce0156aca9f26941da6069b0388db1e73bf9
Parents: f5b36f1 cba5c7f
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:19:41 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:19:41 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/15] 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/d079ce01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d079ce01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d079ce01
Branch: refs/heads/cassandra-3.0
Commit: d079ce0156aca9f26941da6069b0388db1e73bf9
Parents: f5b36f1 cba5c7f
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:19:41 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:19:41 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by aw...@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/cba5c7fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba5c7fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba5c7fa
Branch: refs/heads/cassandra-3.0
Commit: cba5c7fa8b3d2889ef41bfbf98c9efa1a354dc29
Parents: 31590f5 572fef8
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:16:33 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:18:59 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c24ad,2517432..6ffddc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,11 +1,62 @@@
-2.1.18
+2.2.10
+ * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric paths (CASSANDRA-13103)
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
+ * Discard in-flight shadow round responses (CASSANDRA-12653)
+ * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
+ * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
+ * Fix queries updating multiple time the same list (CASSANDRA-13130)
+ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
+ * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886)
+ * 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)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
+Merged from 2.1:
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
* Remove unused repositories (CASSANDRA-13278)
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+
-2.1.17
+2.2.9
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+ * Fix speculative retry bugs (CASSANDRA-13009)
+ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
+ * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
+ * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
+ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
+ * Fix Util.spinAssertEquals (CASSANDRA-12283)
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
+ * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813)
+ * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)
+ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
+ * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)
+ * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457)
+ * Fix merkle tree depth calculation (CASSANDRA-12580)
+ * Make Collections deserialization more robust (CASSANDRA-12618)
+ * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+Merged from 2.1:
* Use portable stderr for java error in startup (CASSANDRA-13211)
* Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
* Coalescing strategy can enter infinite loop (CASSANDRA-13159)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 867afa4,6d64025..dc5aecb
--- a/build.xml
+++ b/build.xml
@@@ -1177,19 -1074,17 +1179,20 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
- <classpath>
+ <classpath>
<path refid="cassandra.classpath"/>
- </classpath>
- <src path="${test.unit.src}"/>
- <src path="${test.long.src}"/>
- <src path="${test.pig.src}"/>
+ </classpath>
+ <compilerarg value="-XDignore.symbol.file"/>
+ <src path="${test.unit.src}"/>
+ <src path="${test.long.src}"/>
+ <src path="${test.burn.src}"/>
+ <src path="${test.pig.src}"/>
+ <src path="${test.microbench.src}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
[14/15] 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/ba9beea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba9beea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba9beea9
Branch: refs/heads/trunk
Commit: ba9beea9db45268e9e7ba80b2bc719788e6a718e
Parents: 4d24958 d079ce0
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:21:54 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:21:54 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/15] cassandra git commit: Set javac encoding to utf-8
Posted by aw...@apache.org.
Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572fef8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572fef8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572fef8a
Branch: refs/heads/cassandra-3.0
Commit: 572fef8a06172bd925c478ec16540e8e28e84bd7
Parents: 3dfc784
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 14:21:32 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:15:42 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eacd275..2517432 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.18
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Log stacktrace of uncaught exceptions (CASSANDRA-13108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index da42975..6d64025 100644
--- a/build.xml
+++ b/build.xml
@@ -708,6 +708,7 @@
<!-- Order matters! -->
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/>
@@ -715,6 +716,7 @@
</javac>
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${build.src.java}"/>
@@ -739,7 +741,7 @@
</path>
<target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" />
- <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+ <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@@ -1072,6 +1074,7 @@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
includeantruntime="false"
source="${source.version}"
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by aw...@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/cba5c7fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba5c7fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba5c7fa
Branch: refs/heads/trunk
Commit: cba5c7fa8b3d2889ef41bfbf98c9efa1a354dc29
Parents: 31590f5 572fef8
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:16:33 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:18:59 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c24ad,2517432..6ffddc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,11 +1,62 @@@
-2.1.18
+2.2.10
+ * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric paths (CASSANDRA-13103)
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
+ * Discard in-flight shadow round responses (CASSANDRA-12653)
+ * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
+ * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
+ * Fix queries updating multiple time the same list (CASSANDRA-13130)
+ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
+ * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886)
+ * 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)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
+Merged from 2.1:
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
* Remove unused repositories (CASSANDRA-13278)
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+
-2.1.17
+2.2.9
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+ * Fix speculative retry bugs (CASSANDRA-13009)
+ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
+ * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
+ * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
+ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
+ * Fix Util.spinAssertEquals (CASSANDRA-12283)
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
+ * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813)
+ * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)
+ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
+ * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)
+ * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457)
+ * Fix merkle tree depth calculation (CASSANDRA-12580)
+ * Make Collections deserialization more robust (CASSANDRA-12618)
+ * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+Merged from 2.1:
* Use portable stderr for java error in startup (CASSANDRA-13211)
* Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
* Coalescing strategy can enter infinite loop (CASSANDRA-13159)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 867afa4,6d64025..dc5aecb
--- a/build.xml
+++ b/build.xml
@@@ -1177,19 -1074,17 +1179,20 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
- <classpath>
+ <classpath>
<path refid="cassandra.classpath"/>
- </classpath>
- <src path="${test.unit.src}"/>
- <src path="${test.long.src}"/>
- <src path="${test.pig.src}"/>
+ </classpath>
+ <compilerarg value="-XDignore.symbol.file"/>
+ <src path="${test.unit.src}"/>
+ <src path="${test.long.src}"/>
+ <src path="${test.burn.src}"/>
+ <src path="${test.pig.src}"/>
+ <src path="${test.microbench.src}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
[02/15] cassandra git commit: Set javac encoding to utf-8
Posted by aw...@apache.org.
Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572fef8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572fef8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572fef8a
Branch: refs/heads/cassandra-2.2
Commit: 572fef8a06172bd925c478ec16540e8e28e84bd7
Parents: 3dfc784
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 14:21:32 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:15:42 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eacd275..2517432 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.18
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Log stacktrace of uncaught exceptions (CASSANDRA-13108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index da42975..6d64025 100644
--- a/build.xml
+++ b/build.xml
@@ -708,6 +708,7 @@
<!-- Order matters! -->
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/>
@@ -715,6 +716,7 @@
</javac>
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${build.src.java}"/>
@@ -739,7 +741,7 @@
</path>
<target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" />
- <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+ <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@@ -1072,6 +1074,7 @@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
includeantruntime="false"
source="${source.version}"
[05/15] cassandra git commit: Set javac encoding to utf-8
Posted by aw...@apache.org.
Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572fef8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572fef8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572fef8a
Branch: refs/heads/cassandra-3.11
Commit: 572fef8a06172bd925c478ec16540e8e28e84bd7
Parents: 3dfc784
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 14:21:32 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:15:42 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eacd275..2517432 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.18
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
* Log stacktrace of uncaught exceptions (CASSANDRA-13108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572fef8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index da42975..6d64025 100644
--- a/build.xml
+++ b/build.xml
@@ -708,6 +708,7 @@
<!-- Order matters! -->
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${interface.thrift.dir}/gen-java"/>
@@ -715,6 +716,7 @@
</javac>
<javac fork="true"
debug="true" debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
memorymaximumsize="512M">
<src path="${build.src.java}"/>
@@ -739,7 +741,7 @@
</path>
<target name="stress-build" depends="build" description="build stress tool">
<mkdir dir="${stress.build.classes}" />
- <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+ <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@@ -1072,6 +1074,7 @@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
includeantruntime="false"
source="${source.version}"
[11/15] 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/d079ce01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d079ce01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d079ce01
Branch: refs/heads/cassandra-3.11
Commit: d079ce0156aca9f26941da6069b0388db1e73bf9
Parents: f5b36f1 cba5c7f
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:19:41 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:19:41 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by aw...@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/cba5c7fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba5c7fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba5c7fa
Branch: refs/heads/cassandra-3.11
Commit: cba5c7fa8b3d2889ef41bfbf98c9efa1a354dc29
Parents: 31590f5 572fef8
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:16:33 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:18:59 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c24ad,2517432..6ffddc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,11 +1,62 @@@
-2.1.18
+2.2.10
+ * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
+ * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric paths (CASSANDRA-13103)
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
+ * Discard in-flight shadow round responses (CASSANDRA-12653)
+ * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
+ * Wrong logger name in AnticompactionTask (CASSANDRA-13343)
+ * Fix queries updating multiple time the same list (CASSANDRA-13130)
+ * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
+ * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886)
+ * 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)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
+Merged from 2.1:
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
* Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
* Remove unused repositories (CASSANDRA-13278)
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+
-2.1.17
+2.2.9
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+ * Fix speculative retry bugs (CASSANDRA-13009)
+ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
+ * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
+ * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
+ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
+ * Fix Util.spinAssertEquals (CASSANDRA-12283)
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
+ * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813)
+ * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)
+ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
+ * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)
+ * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457)
+ * Fix merkle tree depth calculation (CASSANDRA-12580)
+ * Make Collections deserialization more robust (CASSANDRA-12618)
+ * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+Merged from 2.1:
* Use portable stderr for java error in startup (CASSANDRA-13211)
* Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
* Coalescing strategy can enter infinite loop (CASSANDRA-13159)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba5c7fa/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 867afa4,6d64025..dc5aecb
--- a/build.xml
+++ b/build.xml
@@@ -1177,19 -1074,17 +1179,20 @@@
<javac
debug="true"
debuglevel="${debuglevel}"
+ encoding="utf-8"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
- <classpath>
+ <classpath>
<path refid="cassandra.classpath"/>
- </classpath>
- <src path="${test.unit.src}"/>
- <src path="${test.long.src}"/>
- <src path="${test.pig.src}"/>
+ </classpath>
+ <compilerarg value="-XDignore.symbol.file"/>
+ <src path="${test.unit.src}"/>
+ <src path="${test.long.src}"/>
+ <src path="${test.burn.src}"/>
+ <src path="${test.pig.src}"/>
+ <src path="${test.microbench.src}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
[15/15] 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/049ba2d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049ba2d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/049ba2d4
Branch: refs/heads/trunk
Commit: 049ba2d4d54d22a4dad147b34f37ec0f8c3caa51
Parents: 9308159 ba9beea
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:22:34 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:22:34 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/15] 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/ba9beea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba9beea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba9beea9
Branch: refs/heads/cassandra-3.11
Commit: ba9beea9db45268e9e7ba80b2bc719788e6a718e
Parents: 4d24958 d079ce0
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Apr 21 16:21:54 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Fri Apr 21 16:21:54 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------