Updated Branches: refs/heads/trunk e12d4430e -> 0ba454168
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/0ba45416 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ba45416 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ba45416 Branch: refs/heads/trunk Commit: 0ba4541685640043a4e555d049261e36ca8d8e3b Parents: e12d443 cbac7af Author: Sylvain Lebresne <sylv...@riptano.com> Authored: Sat Feb 4 15:26:58 2012 +0100 Committer: Sylvain Lebresne <sylv...@riptano.com> Committed: Sat Feb 4 15:26:58 2012 +0100 ---------------------------------------------------------------------- .../apache/cassandra/thrift/CassandraServer.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
