Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/703b151b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/703b151b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/703b151b Branch: refs/heads/trunk Commit: 703b151b151b7abcfe5b5aa26fe6349506c33da8 Parents: 74f1e0a ff5c497 Author: Jeff Jirsa <jeff.ji...@crowdstrike.com> Authored: Tue Oct 11 21:24:07 2016 -0700 Committer: Jeff Jirsa <jeff.ji...@crowdstrike.com> Committed: Tue Oct 11 21:25:33 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/auth/CassandraRoleManager.java | 22 +++++++++++++++----- .../serializers/BooleanSerializer.java | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/703b151b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 186a8d3,ae9ef7a..81fb544 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -17,6 -2,10 +17,7 @@@ Merged from 2.2 * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) * Fix merkle tree depth calculation (CASSANDRA-12580) * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) - - -2.2.8 * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block http://git-wip-us.apache.org/repos/asf/cassandra/blob/703b151b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java ----------------------------------------------------------------------
