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/2b7522f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b7522f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b7522f6 Branch: refs/heads/trunk Commit: 2b7522f6678d45b6d9aa207c617cfafac4d5d591 Parents: 65ffc39 96365bf Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Jan 7 14:29:46 2015 -0600 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Jan 7 14:29:46 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- test/unit/org/apache/cassandra/cql3/UseStatementTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b7522f6/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
