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 <c...@apache.org>
Authored: Fri Oct 14 10:29:48 2016 -0400
Committer: Carl Yeksigian <c...@apache.org>
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
----------------------------------------------------------------------

Reply via email to