Updated Branches: refs/heads/cassandra-1.2 bc428351e -> ee0be0624 refs/heads/trunk 8caedfc2c -> 12e4c524b
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/12e4c524 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12e4c524 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12e4c524 Branch: refs/heads/trunk Commit: 12e4c524badccfb13fe5c4a28c9ec2f65571403c Parents: 8caedfc ee0be06 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Feb 14 13:43:15 2013 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Feb 14 13:43:15 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/compress/CompressionMetadata.java | 1 + .../compress/CompressedInputStreamTest.java | 106 +++++++++++++++ 3 files changed, 108 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12e4c524/CHANGES.txt ----------------------------------------------------------------------
