Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73c71672 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73c71672 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73c71672 Branch: refs/heads/cassandra-3.8 Commit: 73c71672bdb48af976cd17909162ea2b3c0ce007 Parents: bc23632 d5a15e4 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Jul 6 10:11:21 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Jul 6 10:11:21 2016 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/73c71672/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------