Updated Branches: refs/heads/cassandra-1.2 fb577447b -> b960b2b82 refs/heads/cassandra-1.2.0 9366fb323 -> cc166a525 refs/heads/trunk f49ca707d -> 6f5fc0a4b
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/6f5fc0a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f5fc0a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f5fc0a4 Branch: refs/heads/trunk Commit: 6f5fc0a4b28f67e2ba0c992f41eaebcca6009df7 Parents: f49ca70 b960b2b Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 21 15:02:26 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 21 15:02:26 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/thrift/CassandraServer.java | 140 +++++++-------- 1 files changed, 63 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
