You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/24 17:48:17 UTC
[10/11] git commit: merge from 1.2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07638f41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07638f41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07638f41
Branch: refs/heads/cassandra-2.0
Commit: 07638f41a8c62932b05bdb498aaaedabd2efd139
Parents: 7af56b5 424206a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:47:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:47:40 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
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 +-
.../org/apache/cassandra/cql3/ResultSet.java | 11 +-
.../cql3/statements/ListUsersStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 4 +-
.../apache/cassandra/service/ClientState.java | 64 +++++++----
.../apache/cassandra/service/QueryState.java | 8 ++
.../cassandra/thrift/ThriftClientState.java | 11 +-
.../cassandra/thrift/ThriftSessionManager.java | 6 +-
.../org/apache/cassandra/tools/NodeCmd.java | 7 ++
.../cassandra/transport/ServerConnection.java | 6 +-
15 files changed, 114 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07638f41/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4d52c99,281665e..830f568
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -2,8 -2,9 +2,10 @@@
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
* Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
* Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
Merged from 1.2:
+ * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)