Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87da74eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87da74eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87da74eb Branch: refs/heads/trunk Commit: 87da74eb543ff9ff3e6294a003a72d028ad720dd Parents: 16f29aa b324759 Author: Sam Tunnicliffe <[email protected]> Authored: Mon Oct 12 12:00:56 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Mon Oct 12 12:00:56 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87da74eb/CHANGES.txt ----------------------------------------------------------------------
