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/9a121232 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a121232 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a121232 Branch: refs/heads/trunk Commit: 9a1212328b066e57f11424153b9a3ed5eeaa0345 Parents: 152da3c d0fae09 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 9 07:36:21 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 9 07:36:21 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a121232/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a121232/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ----------------------------------------------------------------------
