Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63d1d296 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63d1d296 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63d1d296 Branch: refs/heads/trunk Commit: 63d1d2968c59100f5a458b64ef884d4b675557f6 Parents: d33e29a 85b7438 Author: Dave Brosius <[email protected]> Authored: Sat Aug 2 01:45:18 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Aug 2 01:45:18 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
