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/4b477b45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b477b45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b477b45 Branch: refs/heads/trunk Commit: 4b477b45981de09f23a13186e015b26870bfd514 Parents: ac8d3c1 d0c90e0 Author: Marcus Eriksson <[email protected]> Authored: Tue Jun 3 08:02:17 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jun 3 08:02:17 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/streaming/StreamReader.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b477b45/CHANGES.txt ----------------------------------------------------------------------
