You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/11/10 03:49:12 UTC

[1/4] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches:
  refs/heads/cassandra-1.2 5c81f4b92 -> 4549a98b4
  refs/heads/cassandra-1.2.0 5c81f4b92 -> 4549a98b4
  refs/heads/trunk d82c4408c -> f9607c113


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/f9607c11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9607c11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9607c11

Branch: refs/heads/trunk
Commit: f9607c11384e60505ede239ce409d3ff4b542a82
Parents: d82c440 4549a98
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Nov 9 20:49:05 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Nov 9 20:49:05 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cassandra/io/compress/CompressionMetadata.java |   35 ++++---
 .../cassandra/io/util/CompressedSegmentedFile.java |    2 +-
 src/java/org/apache/cassandra/io/util/Memory.java  |   12 +++
 .../org/apache/cassandra/utils/BigLongArray.java   |   77 ---------------
 5 files changed, 35 insertions(+), 92 deletions(-)
----------------------------------------------------------------------