Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bcaf5b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bcaf5b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bcaf5b8 Branch: refs/heads/trunk Commit: 1bcaf5b800ad654cb6c26e846a2f29e32430cf24 Parents: 407980c 1a3cd2a Author: Dave Brosius <dbros...@apache.org> Authored: Fri Aug 23 20:53:39 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Aug 23 20:53:39 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
