Updated Branches: refs/heads/cassandra-1.2 7ca9b6970 -> a548f05de refs/heads/trunk cdeb9286f -> ce9efef06
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce9efef0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce9efef0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce9efef0 Branch: refs/heads/trunk Commit: ce9efef065a601f5ec8ac63a354090c429dacdbe Parents: cdeb928 a548f05 Author: Yuki Morishita <[email protected]> Authored: Tue Jan 15 12:52:36 2013 -0600 Committer: Yuki Morishita <[email protected]> Committed: Tue Jan 15 12:52:36 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/IncomingStreamReader.java | 9 +++++---- .../streaming/compress/CompressedInputStream.java | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce9efef0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce9efef0/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java ----------------------------------------------------------------------
