Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51220ffe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51220ffe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51220ffe Branch: refs/heads/cassandra-2.1 Commit: 51220ffe2a2b73fc976635da5464573d0cb7ea93 Parents: 4c22b16 dce5599 Author: Mikhail Stepura <mish...@apache.org> Authored: Thu Mar 13 13:06:03 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu Mar 13 13:06:03 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/51220ffe/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
