Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e59fef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e59fef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e59fef Branch: refs/heads/trunk Commit: 56e59fefcffaf3a49a716da68494c745ea4eb5e6 Parents: a1c7c13 83ff1da Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Apr 19 06:08:07 2013 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Apr 19 06:08:07 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../cassandra/net/OutboundTcpConnection.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e59fef/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e59fef/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ----------------------------------------------------------------------
