Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9510eb0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9510eb0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9510eb0f Branch: refs/heads/trunk Commit: 9510eb0f3cf9f3cb085c218242e31627c37383b9 Parents: 7d9acdb 7fa0341 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Dec 9 13:59:56 2014 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Dec 9 13:59:56 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cql3/Cql.g | 1 + .../org/apache/cassandra/cql3/CQLTester.java | 25 +++++++++++++++-- .../apache/cassandra/cql3/UseStatementTest.java | 29 ++++++++++++++++++++ 4 files changed, 54 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9510eb0f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9510eb0f/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9510eb0f/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
