Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/058faff6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/058faff6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/058faff6 Branch: refs/heads/trunk Commit: 058faff6f906c1b9f2c0e7b6eaa24361a34fe801 Parents: a6f5009 0b49b17 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jul 20 15:03:42 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jul 20 15:03:42 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/058faff6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5fc87ee,ef80141..c51c9b1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ +3.10 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424) + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + + 3.9 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) Merged from 3.0: * NullPointerExpception when reading/compacting table (CASSANDRA-11988)