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/a4e8e165 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e8e165 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e8e165 Branch: refs/heads/trunk Commit: a4e8e1656536fdf8121b3affa0af3195d98db4f5 Parents: 35047a8 63d1d29 Author: Dave Brosius <[email protected]> Authored: Sat Aug 2 01:45:56 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Aug 2 01:45:56 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
