Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74ac3cef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74ac3cef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74ac3cef Branch: refs/heads/trunk Commit: 74ac3cef1068d46046560b4bf80fd1f47a439510 Parents: 5fdb90e 315356c Author: Jason Brown <jasedbr...@gmail.com> Authored: Sun Aug 14 08:44:04 2016 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sun Aug 14 08:44:32 2016 -0700 ---------------------------------------------------------------------- .../unit/org/apache/cassandra/streaming/StreamingTransferTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74ac3cef/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ----------------------------------------------------------------------
