Merge branch 'cassandra-3.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/0caa17de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0caa17de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0caa17de Branch: refs/heads/trunk Commit: 0caa17de0eb0cb96b463093bd5fa4e1cbefd0b07 Parents: f81a91d 36019ab Author: Marcus Eriksson <[email protected]> Authored: Fri Nov 20 11:07:09 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Nov 20 11:07:09 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/0caa17de/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0caa17de/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
