You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/03/01 21:49:34 UTC
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
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/9bbb4497
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bbb4497
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bbb4497
Branch: refs/heads/cassandra-3.0
Commit: 9bbb449736912562348f9f6565a17e6be1c1fba6
Parents: aa66c99 301f7c5
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Wed Mar 1 13:41:06 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Wed Mar 1 13:43:37 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.properties.default | 3 ---
build.xml | 5 -----
3 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bbb4497/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c27c2b1,111f3de..404440a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,8 +1,47 @@@
-2.1.18
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+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)
+ * 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)
+Merged from 2.1:
+ * 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/9bbb4497/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d815ede,da42975..6dbdb9e
--- a/build.xml
+++ b/build.xml
@@@ -654,17 -571,12 +653,15 @@@
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
- <remoteRepository refid="java.net2"/>
</artifact:dependencies>
- <artifact:dependencies pomRefId="coverage-deps-pom"
- pathId="cobertura.classpath">
+ <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
+ <artifact:dependencies pomRefId="build-deps-pom-sources"
+ sourcesFilesetId="build-dependency-sources"
+ cacheDependencyRefs="true"
+ dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
<remoteRepository refid="central"/>
+ <remoteRepository refid="apache"/>
- <remoteRepository refid="java.net2"/>
</artifact:dependencies>
-
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
<mapper type="flatten"/>