cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 29 May 2014 20:00:33 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8d18c9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8d18c9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8d18c9c

Branch: refs/heads/trunk
Commit: a8d18c9c1968df1581881a0f82d1c8a3b3ed1e12
Parents: 77f06b8 7216639
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu May 29 23:00:03 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu May 29 23:00:03 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/a8d18c9c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fbe5f70,28c2ad6..f313278
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -77,10 -45,11 +77,11 @@@ Merged from 2.0
   * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
   * Invalid key cache entries on DROP (CASSANDRA-6525)
   * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
++ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8d18c9c/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8d18c9c/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------


Mime
View raw message