Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e7cdc2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e7cdc2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e7cdc2c Branch: refs/heads/trunk Commit: 5e7cdc2cb790c6d6d3886e0b554d0fbb3966bd9f Parents: 747e100 6734e94 Author: Yuki Morishita <yu...@apache.org> Authored: Tue May 26 12:20:27 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue May 26 12:20:27 2015 -0500 ---------------------------------------------------------------------- .../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) ----------------------------------------------------------------------