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/535353cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/535353cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/535353cd Branch: refs/heads/trunk Commit: 535353cd858d50a046f089961f6f51ee4171ef39 Parents: eb19354 6a4144b Author: Tyler Hobbs <[email protected]> Authored: Tue Jun 3 17:33:20 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue Jun 3 17:33:20 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 3 +- pylib/cqlshlib/cql3handling.py | 34 ++++++++-- src/java/org/apache/cassandra/cql3/Cql.g | 15 ++++- .../org/apache/cassandra/cql3/IndexName.java | 65 ++++++++++++++++++++ .../cql3/statements/DropIndexStatement.java | 6 +- 6 files changed, 114 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/535353cd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/535353cd/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
