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

Branch: refs/heads/trunk
Commit: b51f7e25977cc82a54be24bb254ff3fa82b11795
Parents: e66305d f5bc378
Author: Carl Yeksigian <c...@apache.org>
Authored: Mon Oct 17 16:16:55 2016 -0400
Committer: Carl Yeksigian <c...@apache.org>
Committed: Mon Oct 17 16:16:55 2016 -0400

----------------------------------------------------------------------
 .../apache/cassandra/cql3/ReservedKeywords.java | 28 ++-----------
 .../cassandra/cql3/ReservedKeywordsTest.java    | 43 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


Reply via email to