Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36019ab1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36019ab1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36019ab1 Branch: refs/heads/trunk Commit: 36019ab1728eb084b201ec452d17047555ebc1ef Parents: 28e51d6 f4ae344 Author: Marcus Eriksson <[email protected]> Authored: Fri Nov 20 11:06:58 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Nov 20 11:06:58 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 1 + .../DateTieredCompactionStrategy.java | 34 +++++++++++--------- .../DateTieredCompactionStrategyOptions.java | 30 +++++++++++++++-- .../DateTieredCompactionStrategyTest.java | 34 ++++++++++++-------- 5 files changed, 70 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36019ab1/CHANGES.txt ----------------------------------------------------------------------
