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/32c3b6e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32c3b6e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32c3b6e5 Branch: refs/heads/trunk Commit: 32c3b6e526e191532358730f0d4d9dfbf1aa7b0e Parents: 3563350 59bd0e7 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon May 6 09:16:07 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon May 6 09:16:07 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/locator/Ec2Snitch.java | 15 --------------- .../cassandra/net/OutboundTcpConnectionPool.java | 2 ++ .../cassandra/streaming/IncomingStreamReader.java | 6 ++++++ 4 files changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32c3b6e5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32c3b6e5/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java ----------------------------------------------------------------------
