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/dde4d829 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dde4d829 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dde4d829 Branch: refs/heads/trunk Commit: dde4d82938f0d5951b0473cfb9d62d7ab0d9b637 Parents: 2fc3a89 818ec33 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jan 9 00:28:56 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jan 9 00:28:56 2015 -0500 ---------------------------------------------------------------------- .../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dde4d829/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------
