Merge branch 'cassandra-3.0' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5bc3784 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5bc3784 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5bc3784 Branch: refs/heads/cassandra-3.X Commit: f5bc3784fb08741b2d4636dd09061b06c3d893d6 Parents: 720acc6 bc9a079 Author: Carl Yeksigian <c...@apache.org> Authored: Mon Oct 17 16:16:29 2016 -0400 Committer: Carl Yeksigian <c...@apache.org> Committed: Mon Oct 17 16:16:29 2016 -0400 ---------------------------------------------------------------------- .../apache/cassandra/cql3/ReservedKeywords.java | 28 ++----------- .../cassandra/cql3/ReservedKeywordsTest.java | 43 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
