You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/06/02 09:00:49 UTC
[3/3] 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/d6602239
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6602239
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6602239
Branch: refs/heads/trunk
Commit: d66022392f4cd4b8ef840adbef4ec6733ec4a51e
Parents: 953a372 e398c6b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Jun 2 09:00:03 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Jun 2 09:00:03 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamSession.java | 32 ++++++++++++--------
2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6602239/CHANGES.txt
----------------------------------------------------------------------