Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29c653de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29c653de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29c653de Branch: refs/heads/cassandra-3.1 Commit: 29c653de66b689939ea21f56080f88f6f3946dc6 Parents: 2a33c3b 814bc70 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Dec 3 17:29:48 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Dec 3 17:29:48 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------