Updated Branches: refs/heads/cassandra-1.2 0b83682b4 -> f2a57f04c refs/heads/trunk 36f632c9e -> 7049ab44d
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/7049ab44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7049ab44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7049ab44 Branch: refs/heads/trunk Commit: 7049ab44df7ac89229c16973ddedb772ee23db16 Parents: 36f632c f2a57f0 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Feb 14 19:06:24 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Feb 14 19:06:24 2013 -0600 ---------------------------------------------------------------------- .../compaction/SizeTieredCompactionStrategy.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7049ab44/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------
