[8/8] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[carl]

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/8d97e3d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d97e3d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d97e3d9

Branch: refs/heads/trunk
Commit: 8d97e3d9b615e3ebf006156d93e03448b84247cd
Parents: d31ce66 09da51e
Author: Carl Yeksigian 
Authored: Mon Dec 5 12:28:25 2016 -0500
Committer: Carl Yeksigian 
Committed: Mon Dec 5 12:28:25 2016 -0500

--

--

[8/8] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[jake]

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/1b91cd59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b91cd59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b91cd59

Branch: refs/heads/trunk
Commit: 1b91cd595c4f79c6c3c294f78867fe213b50a960
Parents: ad12033 9259a2a
Author: T Jake Luciani 
Authored: Fri Nov 11 14:26:54 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 11 14:26:54 2016 -0500

--

--

[8/8] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[aleksey]

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 
Authored: Mon Oct 17 18:28:34 2016 +0100
Committer: Aleksey Yeschenko 
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)

[8/8] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

[carl]

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/17bd6adc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17bd6adc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17bd6adc

Branch: refs/heads/trunk
Commit: 17bd6adc8f35dcb44e3e4848e267c256c0c59182
Parents: 56bc77c 206a7bb
Author: Carl Yeksigian 
Authored: Fri Oct 14 10:29:48 2016 -0400
Committer: Carl Yeksigian 
Committed: Fri Oct 14 10:29:48 2016 -0400

--
 CHANGES.txt |   1 +
 src/antlr/Lexer.g   |   2 +
 src/antlr/Parser.g  |   2 +-
 .../apache/cassandra/cql3/ColumnIdentifier.java |   2 +-
 .../apache/cassandra/cql3/ReservedKeywords.java | 118 +++
 .../org/apache/cassandra/cql3/ViewTest.java |  20 
 .../db/ColumnFamilyStoreCQLHelperTest.java  |   4 +-
 7 files changed, 145 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17bd6adc/CHANGES.txt
--