Merge branch 'cassandra-2.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/5c35f920 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c35f920 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c35f920 Branch: refs/heads/trunk Commit: 5c35f9203f1af8fccd7ea9b65a00b4967a55d2e5 Parents: 985c510 1bae25a Author: Jake Luciani <j...@apache.org> Authored: Thu Oct 9 17:16:56 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Thu Oct 9 17:16:56 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/Server.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c35f920/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
