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

Branch: refs/heads/trunk
Commit: dffe270778c2d942708b42de03839327f17725d7
Parents: 9f16749 8309543
Author: Benjamin Lerer <b.le...@gmail.com>
Authored: Tue Oct 11 10:51:59 2016 +0200
Committer: Benjamin Lerer <b.le...@gmail.com>
Committed: Tue Oct 11 10:57:26 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/antlr/Cql.g                                 | 17 +++++++
 src/antlr/Parser.g                              | 48 +++++++++++++-------
 .../apache/cassandra/cql3/CqlParserTest.java    | 15 +++---
 .../validation/operations/AggregationTest.java  |  4 +-
 5 files changed, 61 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dffe2707/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6977168,2f517e0..1310795
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +4.0
 + * 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
+  * Exit query parsing upon first error (CASSANDRA-12598)
   * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
   * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
   * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)

Reply via email to