Merge branch 'cassandra-3.11' into trunk

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

Branch: refs/heads/trunk
Commit: a61764d6cb4e877e1f0d383bc4cd49b2dd00b9d1
Parents: 3228716 cdcd652
Author: Jeff Jirsa <[email protected]>
Authored: Thu Dec 7 13:21:12 2017 -0800
Committer: Jeff Jirsa <[email protected]>
Committed: Thu Dec 7 13:21:38 2017 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/auth/RoleResource.java |  4 ++--
 .../miscellaneous/RoleSyntaxTest.java           | 23 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a61764d6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ef414b9,691b285..6d3f398
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -179,9 -8,10 +179,10 @@@
   * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
  Merged from 3.0:
  3.0.16
+  * Accept role names containing forward-slash (CASSANDRA-14088)
   * Optimize CRC check chance probability calculations (CASSANDRA-14094)
   * Fix cleanup on keyspace with no replicas (CASSANDRA-13526)
 - * Fix updating base table rows with TTL not removing view entries 
(CASSANDRA-14071)
 + * Fix updating base table rows with TTL not removing materialized view 
entries (CASSANDRA-14071)
   * Reduce garbage created by DynamicSnitch (CASSANDRA-14091)
   * More frequent commitlog chained markers (CASSANDRA-13987)
   * Fix serialized size of DataLimits (CASSANDRA-14057)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to