Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4724d562 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4724d562 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4724d562 Branch: refs/heads/trunk Commit: 4724d562ca02e06dcc26c7126f1ba3ddeb811250 Parents: e488e58 1b858be Author: Brandon Williams <[email protected]> Authored: Fri Jan 24 17:01:57 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 24 17:01:57 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
