Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9eb16ae5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9eb16ae5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9eb16ae5 Branch: refs/heads/trunk Commit: 9eb16ae5b37bd02914dc00643e87e3e0bc7af85e Parents: 4bc9b47 9cd6823 Author: Yuki Morishita <[email protected]> Authored: Thu Apr 3 16:28:53 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Apr 3 16:28:53 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/StreamTransferTaskTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
