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/7f8a0984 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f8a0984 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f8a0984 Branch: refs/heads/trunk Commit: 7f8a098403692e18f77e3173f7d92537dd842de4 Parents: 4807f12 3b3570c8 Author: Yuki Morishita <[email protected]> Authored: Wed Feb 25 08:59:02 2015 -0800 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 25 08:59:02 2015 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
