cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/13] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Sat, 08 Dec 2012 16:20:38 GMT
Merge branch 'cassandra-1.2.0' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: 24154fca1f8873f3aeb1efd65aaa66fac3f862df
Parents: ee0d178 66706d1
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Dec 8 10:19:38 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Dec 8 10:19:38 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/24154fca/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message