Updated Branches: refs/heads/trunk 0d5738f1f -> 61a8259d9
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61a8259d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61a8259d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61a8259d Branch: refs/heads/trunk Commit: 61a8259d9593120e34b1140e3c0b190e385cdea5 Parents: 0d5738f 85443ec Author: Sylvain Lebresne <[email protected]> Authored: Mon Jan 21 17:05:00 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jan 21 17:05:00 2013 +0100 ---------------------------------------------------------------------- NEWS.txt | 10 ++-- .../org/apache/cassandra/service/ClientState.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 45 +++++++++++++- 3 files changed, 47 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61a8259d/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
