Updated Branches: refs/heads/trunk 1d67b64f2 -> e692c1b04
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/e692c1b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e692c1b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e692c1b0 Branch: refs/heads/trunk Commit: e692c1b04f3bcf4efa5150e9b47e9806ee894f85 Parents: 1d67b64 858dfef Author: Sylvain Lebresne <[email protected]> Authored: Tue Feb 12 14:02:04 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Feb 12 14:02:04 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ build.xml | 2 +- .../cassandra/transport/FrameCompressor.java | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e692c1b0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e692c1b0/build.xml ----------------------------------------------------------------------
