You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2017/01/18 20:53:20 UTC
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
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/d32ae4a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d32ae4a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d32ae4a6
Branch: refs/heads/trunk
Commit: d32ae4a60efff6798d31cbbccf928e19123b2283
Parents: 3d2439a affa68f
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jan 18 12:52:04 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jan 18 12:52:39 2017 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/stress/settings/SettingsMisc.java | 51 +++++++-------------
2 files changed, 18 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32ae4a6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 99cfe6e,853ca09..a67cf43
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -138,10 -109,12 +138,11 @@@
* Remove pre-startup check for open JMX port (CASSANDRA-12074)
* Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
* Restore resumable hints delivery (CASSANDRA-11960)
- * Properly report LWT contention (CASSANDRA-12626)
+ * Properly record CAS contention (CASSANDRA-12626)
Merged from 3.0:
- * Stress daemon help is incorrect(CASSANDRA-12563)
- * Remove ALTER TYPE support (CASSANDRA-12443)
- * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
++ * Stress daemon help is incorrect (CASSANDRA-12563)
* Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
* Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
* Add parent repair session id to anticompaction log message (CASSANDRA-12186)
* Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)