cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Tue, 18 Dec 2012 20:54:37 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/9fdccd76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fdccd76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fdccd76

Branch: refs/heads/trunk
Commit: 9fdccd7683c7c950ff6dd48bad8739af6a4f2468
Parents: a6d4f7a fb9ad74
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Dec 18 14:54:18 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Dec 18 14:54:18 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 conf/cassandra.yaml                                |   15 ++++++---------
 .../db/compaction/AbstractCompactedRow.java        |    3 ++-
 .../cassandra/db/compaction/CompactionTask.java    |    3 +++
 .../db/compaction/LazilyCompactedRow.java          |    2 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |    2 ++
 6 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fdccd76/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message