Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/455e673b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/455e673b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/455e673b Branch: refs/heads/trunk Commit: 455e673bc9be2311e89eb245318fc1808566c6aa Parents: d3698f8 326d545 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Sep 24 17:00:56 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Sep 24 17:00:56 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + examples/client_only/src/ClientOnlyExample.java | 109 ++++--------------- src/java/org/apache/cassandra/auth/Auth.java | 5 +- .../cassandra/auth/CassandraAuthorizer.java | 2 +- .../cassandra/auth/PasswordAuthenticator.java | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 5 +- .../cql3/statements/ListUsersStatement.java | 2 +- .../apache/cassandra/service/ClientState.java | 64 +++++++---- .../apache/cassandra/service/QueryState.java | 8 ++ .../cassandra/thrift/ThriftClientState.java | 11 +- .../cassandra/thrift/ThriftSessionManager.java | 6 +- .../cassandra/transport/ServerConnection.java | 6 +- 12 files changed, 96 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/455e673b/CHANGES.txt ----------------------------------------------------------------------
