Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e2c7f08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e2c7f08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e2c7f08 Branch: refs/heads/trunk Commit: 9e2c7f080cfab5dd8856aa4b0a741874ce485774 Parents: 73793d6 19f6075 Author: Marcus Eriksson <[email protected]> Authored: Tue Jan 5 10:36:42 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jan 5 10:36:42 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
