Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dce55999 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce55999 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce55999 Branch: refs/heads/trunk Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885 Parents: da2d971 173df48 Author: Mikhail Stepura <mish...@apache.org> Authored: Thu Mar 13 13:05:52 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu Mar 13 13:05:52 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
