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/3465799a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3465799a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3465799a Branch: refs/heads/trunk Commit: 3465799a387046e476bad01e684066b1800cd7d5 Parents: 065d87a 6016067 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue Jan 24 08:07:59 2017 -0800 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue Jan 24 08:07:59 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/auth/FunctionResource.java | 4 ++++ .../cql3/validation/entities/UFAuthTest.java | 25 ++++++++++++++++++++ 3 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3465799a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 86ecbc4,2f0e8f1..dd25cac --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -140,13 -109,15 +140,14 @@@ * 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: + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Stress daemon help is incorrect (CASSANDRA-12563) * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) - * Stress daemon help is incorrect(CASSANDRA-12563) - * Remove ALTER TYPE support (CASSANDRA-12443) - * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) * 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)
