Updated Branches: refs/heads/trunk 7d49929c7 -> c2d9fcde0
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/c2d9fcde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2d9fcde Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2d9fcde Branch: refs/heads/trunk Commit: c2d9fcde09100f84ee9002465ed9c1767f3ed226 Parents: 7d49929 db87052 Author: Vijay Parthasarathy <[email protected]> Authored: Tue Jan 22 23:45:23 2013 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Tue Jan 22 23:45:23 2013 -0800 ---------------------------------------------------------------------- .../cassandra/net/OutboundTcpConnection.java | 8 +++++--- .../cassandra/net/OutboundTcpConnectionPool.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
