Merge branch 'cassandra-1.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/2170f1e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2170f1e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2170f1e8 Branch: refs/heads/cassandra-1.0 Commit: 2170f1e80daf25e75b9cc15226a4d5ed9cd4c7fa Parents: c738e56 e0c655d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 14 14:15:07 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 14 14:15:07 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/streaming/FileStreamTask.java | 8 +++++++- .../cassandra/streaming/StreamOutSession.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
