You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/06/05 14:26:48 UTC
[1/3] cassandra git commit: Fix existence check in
CassandraRoleManager
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 24a1a5d71 -> 76cbddebc
refs/heads/trunk 706b3b804 -> 0149e3424
Fix existence check in CassandraRoleManager
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cbddeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cbddeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cbddeb
Branch: refs/heads/cassandra-2.2
Commit: 76cbddebc7c8cd8bc944c0631cce326da9396a90
Parents: 24a1a5d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 5 10:32:42 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 5 13:21:22 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/auth/CassandraRoleManager.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9aadeff..f66efda 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
* Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
* Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
* Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 261631d..802ae3c 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -43,7 +43,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.mindrot.jbcrypt.BCrypt;
/**
- * Responsible for the creation, maintainance and delation of roles
+ * Responsible for the creation, maintenance and deletion of roles
* for the purposes of authentication and authorization.
* Role data is stored internally, using the roles and role_members tables
* in the system_auth keyspace.
@@ -65,7 +65,7 @@ import org.mindrot.jbcrypt.BCrypt;
* extends CassandraRoleManager and which includes Option.PASSWORD in the Set<Option>
* returned from supportedOptions/alterableOptions. Any additional processing
* of the password itself (such as storing it in an alternative location) would
- * be added in overriden createRole and alterRole implementations.
+ * be added in overridden createRole and alterRole implementations.
*/
public class CassandraRoleManager implements IRoleManager
{
@@ -437,7 +437,7 @@ public class CassandraRoleManager implements IRoleManager
for (String memberOf : role.memberOf)
{
Role granted = getRole(memberOf);
- if (role.equals(NULL_ROLE))
+ if (granted.equals(NULL_ROLE))
continue;
collected.add(RoleResource.role(granted.name));
if (includeInherited)
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0149e342
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0149e342
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0149e342
Branch: refs/heads/trunk
Commit: 0149e34245ea1250de128fa47b0c4c120b1e403f
Parents: 706b3b8 76cbdde
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 5 13:22:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 5 13:22:52 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/auth/CassandraRoleManager.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0149e342/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e1948ac,f66efda..783c4c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
+3.0:
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+
+
2.2
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
* Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
* Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
* Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
[2/3] cassandra git commit: Fix existence check in
CassandraRoleManager
Posted by sa...@apache.org.
Fix existence check in CassandraRoleManager
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cbddeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cbddeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cbddeb
Branch: refs/heads/trunk
Commit: 76cbddebc7c8cd8bc944c0631cce326da9396a90
Parents: 24a1a5d
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 5 10:32:42 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 5 13:21:22 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/auth/CassandraRoleManager.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9aadeff..f66efda 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
* Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
* Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
* Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 261631d..802ae3c 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -43,7 +43,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.mindrot.jbcrypt.BCrypt;
/**
- * Responsible for the creation, maintainance and delation of roles
+ * Responsible for the creation, maintenance and deletion of roles
* for the purposes of authentication and authorization.
* Role data is stored internally, using the roles and role_members tables
* in the system_auth keyspace.
@@ -65,7 +65,7 @@ import org.mindrot.jbcrypt.BCrypt;
* extends CassandraRoleManager and which includes Option.PASSWORD in the Set<Option>
* returned from supportedOptions/alterableOptions. Any additional processing
* of the password itself (such as storing it in an alternative location) would
- * be added in overriden createRole and alterRole implementations.
+ * be added in overridden createRole and alterRole implementations.
*/
public class CassandraRoleManager implements IRoleManager
{
@@ -437,7 +437,7 @@ public class CassandraRoleManager implements IRoleManager
for (String memberOf : role.memberOf)
{
Role granted = getRole(memberOf);
- if (role.equals(NULL_ROLE))
+ if (granted.equals(NULL_ROLE))
continue;
collected.add(RoleResource.role(granted.name));
if (includeInherited)