Updated Branches: refs/heads/cassandra-1.1 6a6bf3cf1 -> 9a842c7b3 refs/heads/trunk ddc771dc5 -> 232da8248
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/232da824 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/232da824 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/232da824 Branch: refs/heads/trunk Commit: 232da8248072991dc521d1fe579a55679ea6c735 Parents: ddc771d 9a842c7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 13 09:57:53 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 13 09:57:53 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 4 +- .../apache/cassandra/thrift/CassandraServer.java | 121 ++++++++------- 2 files changed, 69 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
