Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4045c293 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4045c293 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4045c293 Branch: refs/heads/trunk Commit: 4045c2933935a8cc73a9034c60e7680f625078eb Parents: 51a9285 5931eb4 Author: Robert Stupp <[email protected]> Authored: Mon Jun 22 16:50:50 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Jun 22 16:50:50 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 +-- .../cql3/CreateAndAlterKeyspaceTest.java | 37 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4045c293/CHANGES.txt ----------------------------------------------------------------------
