cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [11/11] git commit: merge from 2.0
Date Tue, 24 Sep 2013 15:48:18 GMT
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 2fea9fab059dc8f3bdfb0c29eef6dd5d162342e8
Parents: bab62d5 938e698
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Sep 24 10:48:03 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Sep 24 10:48:03 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/2fea9fab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 60cae04,cd6fd05..97c99d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,8 -10,9 +10,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)


Mime
View raw message