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 05:01:29 UTC

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

Updated Branches:
  refs/heads/cassandra-1.2 4549a98b4 -> de6260ddc
  refs/heads/cassandra-1.2.0 4549a98b4 -> de6260ddc
  refs/heads/trunk f9607c113 -> 9e60586d6


Merge branch 'cassandra-1.2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e60586d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e60586d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e60586d

Branch: refs/heads/trunk
Commit: 9e60586d644e56cdd963c98dbd31af7ed80827de
Parents: f9607c1 de6260d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Nov 9 22:01:24 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Nov 9 22:01:24 2012 -0600

----------------------------------------------------------------------
 .../cassandra/io/compress/CompressionMetadata.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------