Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cd77474 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cd77474 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cd77474 Branch: refs/heads/trunk Commit: 4cd774747e83c3e0443b66a4df674ef651c22b81 Parents: b3a0130 04cc3a9 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Oct 17 18:28:34 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Oct 17 18:28:34 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/cql3/functions/AggregateFcts.java | 425 ++++++++++--------- .../validation/operations/AggregationTest.java | 155 +++++-- 3 files changed, 339 insertions(+), 243 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cd77474/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 63ed4a6,d230462..97bdd3b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + + 3.10 + * Improve sum aggregate functions (CASSANDRA-12417) * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761) * cqlsh fails to format collections when using aliases (CASSANDRA-11534) * Check for hash conflicts in prepared statements (CASSANDRA-12733)
