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 2016/11/14 12:52:51 UTC

[1/6] cassandra git commit: Use correct system_auth table names in cassandra.yaml

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 8f15eb1b7 -> d5326866d
  refs/heads/cassandra-3.X 5e9d9ebb0 -> 2f3e07a0a
  refs/heads/trunk 65098d004 -> 9b02ce983


Use correct system_auth table names in cassandra.yaml

Patch by Eduard Tudenhoefner; reviewed by Sam Tunnicliffe for
CASSANDRA-12911


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

Branch: refs/heads/cassandra-3.0
Commit: d5326866d3cca1446356f939aa09f68eda864ed5
Parents: 8f15eb1
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Nov 14 12:49:46 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:48:06 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326866/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 085b68e..bece97a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -95,7 +95,7 @@ batchlog_replay_throttle_in_kb: 1024
 #
 # - AllowAllAuthenticator performs no checks - set it to disable authentication.
 # - PasswordAuthenticator relies on username/password pairs to authenticate
-#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   users. It keeps usernames and hashed passwords in system_auth.roles table.
 #   Please increase system_auth keyspace replication factor if you use this authenticator.
 #   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
 authenticator: AllowAllAuthenticator
@@ -105,7 +105,7 @@ authenticator: AllowAllAuthenticator
 # CassandraAuthorizer}.
 #
 # - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
-# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+# - CassandraAuthorizer stores permissions in system_auth.role_permissions table. Please
 #   increase system_auth keyspace replication factor if you use this authorizer.
 authorizer: AllowAllAuthorizer
 


[6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

Posted by sa...@apache.org.
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/9b02ce98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b02ce98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b02ce98

Branch: refs/heads/trunk
Commit: 9b02ce9833db659a54ca3af692fb4bba1eb86a7a
Parents: 65098d0 2f3e07a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Nov 14 12:49:25 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:49:25 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[2/6] cassandra git commit: Use correct system_auth table names in cassandra.yaml

Posted by sa...@apache.org.
Use correct system_auth table names in cassandra.yaml

Patch by Eduard Tudenhoefner; reviewed by Sam Tunnicliffe for
CASSANDRA-12911


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

Branch: refs/heads/cassandra-3.X
Commit: d5326866d3cca1446356f939aa09f68eda864ed5
Parents: 8f15eb1
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Nov 14 12:49:46 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:48:06 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326866/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 085b68e..bece97a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -95,7 +95,7 @@ batchlog_replay_throttle_in_kb: 1024
 #
 # - AllowAllAuthenticator performs no checks - set it to disable authentication.
 # - PasswordAuthenticator relies on username/password pairs to authenticate
-#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   users. It keeps usernames and hashed passwords in system_auth.roles table.
 #   Please increase system_auth keyspace replication factor if you use this authenticator.
 #   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
 authenticator: AllowAllAuthenticator
@@ -105,7 +105,7 @@ authenticator: AllowAllAuthenticator
 # CassandraAuthorizer}.
 #
 # - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
-# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+# - CassandraAuthorizer stores permissions in system_auth.role_permissions table. Please
 #   increase system_auth keyspace replication factor if you use this authorizer.
 authorizer: AllowAllAuthorizer
 


[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: 2f3e07a0ad0f92f5646a532f2f2a54e87171a9cc
Parents: 5e9d9eb d532686
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Nov 14 12:49:04 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:49:04 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f3e07a0/conf/cassandra.yaml
----------------------------------------------------------------------


[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X

Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: 2f3e07a0ad0f92f5646a532f2f2a54e87171a9cc
Parents: 5e9d9eb d532686
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Nov 14 12:49:04 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:49:04 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f3e07a0/conf/cassandra.yaml
----------------------------------------------------------------------


[3/6] cassandra git commit: Use correct system_auth table names in cassandra.yaml

Posted by sa...@apache.org.
Use correct system_auth table names in cassandra.yaml

Patch by Eduard Tudenhoefner; reviewed by Sam Tunnicliffe for
CASSANDRA-12911


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

Branch: refs/heads/trunk
Commit: d5326866d3cca1446356f939aa09f68eda864ed5
Parents: 8f15eb1
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Nov 14 12:49:46 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Nov 14 12:48:06 2016 +0000

----------------------------------------------------------------------
 conf/cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326866/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 085b68e..bece97a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -95,7 +95,7 @@ batchlog_replay_throttle_in_kb: 1024
 #
 # - AllowAllAuthenticator performs no checks - set it to disable authentication.
 # - PasswordAuthenticator relies on username/password pairs to authenticate
-#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   users. It keeps usernames and hashed passwords in system_auth.roles table.
 #   Please increase system_auth keyspace replication factor if you use this authenticator.
 #   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
 authenticator: AllowAllAuthenticator
@@ -105,7 +105,7 @@ authenticator: AllowAllAuthenticator
 # CassandraAuthorizer}.
 #
 # - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
-# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+# - CassandraAuthorizer stores permissions in system_auth.role_permissions table. Please
 #   increase system_auth keyspace replication factor if you use this authorizer.
 authorizer: AllowAllAuthorizer