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/12 15:28:58 UTC

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

Updated Branches:
  refs/heads/cassandra-1.1 f32110c6c -> a05f6766e
  refs/heads/cassandra-1.2 91187643b -> 93f8fec9d
  refs/heads/cassandra-1.2.0 91187643b -> 93f8fec9d
  refs/heads/trunk a007e1b5f -> d104ca636


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

Branch: refs/heads/trunk
Commit: d104ca636c48433d8d435fa932ff92b6afd409b2
Parents: a007e1b 93f8fec
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 12 08:28:50 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 12 08:28:50 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../cassandra/db/compaction/CompactionManager.java |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------