Updated Branches: refs/heads/trunk 2f115d434 -> e594e0dca
Merge branch cassandra-1.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/e594e0dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e594e0dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e594e0dc Branch: refs/heads/trunk Commit: e594e0dca839124582f05b5787a396c5219c702c Parents: 2f115d4 b318404 Author: Pavel Yaskevich <pove...@gmail.com> Authored: Tue Jan 24 23:28:21 2012 +0200 Committer: Pavel Yaskevich <pove...@gmail.com> Committed: Tue Jan 24 23:28:21 2012 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/QueryProcessor.java | 2 ++ .../org/apache/cassandra/service/ClientState.java | 4 ---- .../apache/cassandra/thrift/CassandraServer.java | 3 +++ .../apache/cassandra/thrift/ThriftValidation.java | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e594e0dc/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e594e0dc/src/java/org/apache/cassandra/service/ClientState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e594e0dc/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e594e0dc/src/java/org/apache/cassandra/thrift/ThriftValidation.java ----------------------------------------------------------------------
