You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/01 05:49:15 UTC
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
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/5fe16c09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe16c09
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe16c09
Branch: refs/heads/trunk
Commit: 5fe16c09ae3981f9ce21d7c30b2025da93c5ded0
Parents: b4a354f 3ae5559
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 30 20:49:04 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 30 20:49:04 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------