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/bbc796df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc796df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc796df Branch: refs/heads/trunk Commit: bbc796dfd092e01c8c42e1885819f6ba193260f9 Parents: be6295e 0276c2a Author: Yuki Morishita <[email protected]> Authored: Fri May 1 16:56:37 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri May 1 16:56:37 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/messages/IncomingFileMessage.java | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc796df/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc796df/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java ----------------------------------------------------------------------
