natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
This commit is contained in:
Aleksey Yeschenko 2014-05-30 21:24:24 +03:00
parent 8436ee6166 8480fa7be1
commit 9141f7ba73
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -1,3 +1,8 @@
2.1.0
Merged from 1.2:
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
2.1.0-rc1
* Revert flush directory (CASSANDRA-6357)
* More efficient executor service for fast operations (CASSANDRA-4718)

2
src/java/org/apache/cassandra/auth/Auth.java
View File

@ -171,7 +171,7 @@ public class Auth
if (username.equals(DEFAULT_SUPERUSER_NAME))
return ConsistencyLevel.QUORUM;
else
return ConsistencyLevel.ONE;
return ConsistencyLevel.LOCAL_ONE;
}
private static void setupAuthKeyspace()

2
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
View File

@ -71,7 +71,7 @@ public class CassandraAuthorizer implements IAuthorizer
try
{
ResultMessage.Rows rows = authorizeStatement.execute(QueryState.forInternalCalls(),
QueryOptions.forInternalCalls(ConsistencyLevel.ONE,
QueryOptions.forInternalCalls(ConsistencyLevel.LOCAL_ONE,
Lists.newArrayList(ByteBufferUtil.bytes(user.getName()),
ByteBufferUtil.bytes(resource.getName()))));
result = UntypedResultSet.create(rows.result);

2
src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
View File

@ -254,7 +254,7 @@ public class PasswordAuthenticator implements ISaslAwareAuthenticator
if (username.equals(DEFAULT_USER_NAME))
return ConsistencyLevel.QUORUM;
else
return ConsistencyLevel.ONE;
return ConsistencyLevel.LOCAL_ONE;
}
private class PlainTextSaslAuthenticator implements ISaslAwareAuthenticator.SaslAuthenticator