merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3921d63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3921d63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3921d63 Branch: refs/heads/trunk Commit: d3921d6379bc3035558a8b572ca3703e33249925 Parents: 9f8526f 5b157e4 Author: Jonathan Ellis <[email protected]> Authored: Mon Apr 1 10:45:54 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Apr 1 10:45:54 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/transport/Server.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
