Updated Branches: refs/heads/trunk 3b21f6917 -> 7d49929c7
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/7d49929c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d49929c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d49929c Branch: refs/heads/trunk Commit: 7d49929c76d35778fc0f8409bb79edb75346d941 Parents: 3b21f69 0963469 Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Jan 22 22:45:38 2013 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Jan 22 22:45:38 2013 -0800 ---------------------------------------------------------------------- .../cassandra/net/OutboundTcpConnection.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
