Updated Branches: refs/heads/trunk c2d9fcde0 -> aad2fdd31
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/aad2fdd3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aad2fdd3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aad2fdd3 Branch: refs/heads/trunk Commit: aad2fdd31cf9715612603543287ce95a4e921c61 Parents: c2d9fcd 9719b68 Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Jan 22 23:49:07 2013 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Jan 22 23:49:07 2013 -0800 ---------------------------------------------------------------------- .../cassandra/net/OutboundTcpConnection.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
