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/cc4127c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc4127c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc4127c6 Branch: refs/heads/trunk Commit: cc4127c6c779c372f24a65624e86bfa2d8e68d69 Parents: b768bb2 bc4b008 Author: Jake Luciani <[email protected]> Authored: Tue May 6 22:07:01 2014 -0400 Committer: Jake Luciani <[email protected]> Committed: Tue May 6 22:07:01 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../org/apache/cassandra/transport/CBUtil.java | 9 +- .../org/apache/cassandra/transport/Frame.java | 10 ++- .../cassandra/transport/FrameCompressor.java | 94 +++++++++++++++----- .../org/apache/cassandra/transport/Message.java | 52 ++++++++--- .../org/apache/cassandra/transport/Server.java | 17 ++-- 6 files changed, 142 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4127c6/CHANGES.txt ----------------------------------------------------------------------
