cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject cassandra git commit: Merge branch 'cassandra-3.X' into trunk [Forced Update!]
Date Wed, 12 Oct 2016 06:30:07 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 6e9c3db56 -> 0b82c4fc6 (forced update)


Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 0b82c4fc6f6b1fc8a6cb8f9e5a6c00f739dd5e44
Parents: 8e6a58c b25d903
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Tue Oct 11 21:27:20 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Tue Oct 11 23:28:48 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/0b82c4fc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57ff13c,c59459c..cfc46ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -125,6 -119,6 +125,7 @@@ Merged from 2.2
   * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523)
   * Fail repair on non-existing table (CASSANDRA-12279)
   * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
++ * Better handle invalid system roles table (CASSANDRA-12700)
  
  
  3.8, 3.9


Mime
View raw message