Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/818ec331 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/818ec331 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/818ec331 Branch: refs/heads/trunk Commit: 818ec33107be17e000b182ab682013528a596d9b Parents: 8c5a959 ed54e80 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jan 9 00:28:30 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jan 9 00:28:30 2015 -0500 ---------------------------------------------------------------------- .../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/818ec331/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------
