Updated Branches: refs/heads/trunk c7378a035 -> 7b65883d8
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/7b65883d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b65883d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b65883d Branch: refs/heads/trunk Commit: 7b65883d852f6370a10698b74940b5dc3b428491 Parents: c7378a0 d8e8193 Author: Vijay Parthasarathy <[email protected]> Authored: Thu Feb 28 17:28:58 2013 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Thu Feb 28 17:28:58 2013 -0800 ---------------------------------------------------------------------- .../cassandra/net/OutboundTcpConnection.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
