Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ce8b3fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce8b3fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ce8b3fc Branch: refs/heads/trunk Commit: 6ce8b3fcbbd5f6638ee635fbc395541afdb5eef8 Parents: c64ac41 27c67ad Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Dec 10 15:19:54 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Dec 10 15:19:54 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/DateTieredCompactionStrategyOptions.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce8b3fc/CHANGES.txt ----------------------------------------------------------------------
