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/12/08 17:20:38 UTC
[1/13] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/cassandra-1.1 5e4629793 -> 5b511b621
refs/heads/cassandra-1.2 ee0d178c6 -> 24154fca1
refs/heads/cassandra-1.2.0 bddfa9e12 -> 66706d1cc
refs/heads/trunk 253a7f028 -> e55740885
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/e5574088
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5574088
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5574088
Branch: refs/heads/trunk
Commit: e557408850524ead54c26980e5cbfa7a92410009
Parents: 253a7f0 24154fc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 8 10:19:48 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 8 10:19:48 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/db/compaction/CompactionManager.java | 18 +++++++++++++++
.../cassandra/db/context/CounterContext.java | 12 ++++-----
3 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5574088/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5574088/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------