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/e3df7e21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3df7e21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3df7e21 Branch: refs/heads/trunk Commit: e3df7e21c63fc6f8730df235fe02d4a7f07a21d0 Parents: c4e0907 a8d18c9 Author: Aleksey Yeschenko <[email protected]> Authored: Thu May 29 23:00:25 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu May 29 23:00:25 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 12 +++++++----- .../cassandra/cql3/statements/CreateUserStatement.java | 10 ++++++++-- .../cassandra/cql3/statements/DropUserStatement.java | 10 ++++++++-- 5 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3df7e21/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3df7e21/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
