Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f387d882 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f387d882 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f387d882 Branch: refs/heads/trunk Commit: f387d88249c2e43f651f5e7a14e0f39402c6f445 Parents: 3dcbe90 faa9524 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Mar 16 09:24:03 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Mar 16 09:24:03 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../writers/MaxSSTableSizeWriter.java | 27 +++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f387d882/CHANGES.txt ----------------------------------------------------------------------
