Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6734e94b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6734e94b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6734e94b Branch: refs/heads/trunk Commit: 6734e94b8d17e3a9f15b3eace27e449881ec49d7 Parents: c17e44a 4e26911 Author: Yuki Morishita <yu...@apache.org> Authored: Tue May 26 12:16:43 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue May 26 12:16:43 2015 -0500 ---------------------------------------------------------------------- .../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6734e94b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java ----------------------------------------------------------------------
