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/a639379b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a639379b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a639379b Branch: refs/heads/trunk Commit: a639379ba6becd380a92ae8dfb5bd2ac1597e3a3 Parents: 0485a31 ad60b78 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Sep 26 13:33:00 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Sep 26 13:33:00 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/StreamWriter.java | 22 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a639379b/CHANGES.txt ----------------------------------------------------------------------
