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/afb5ce50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afb5ce50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afb5ce50 Branch: refs/heads/trunk Commit: afb5ce5038756530a605a697347b807162a3bcbb Parents: 4be915f 69960af Author: Vijay <[email protected]> Authored: Wed Apr 2 16:47:54 2014 -0700 Committer: Vijay <[email protected]> Committed: Wed Apr 2 16:47:54 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
