Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f6eb566 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f6eb566 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f6eb566 Branch: refs/heads/trunk Commit: 3f6eb566566c10b4ac41edaae9c63858a8a31e3a Parents: 322e21e 99d5c39 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Sep 8 13:45:25 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Sep 8 13:45:25 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ .../db/compaction/CompactionManager.java | 42 ++++++-------------- .../org/apache/cassandra/utils/FBUtilities.java | 19 +++++++-- .../org/apache/cassandra/utils/Throwables.java | 16 ++++++++ 4 files changed, 47 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f6eb566/CHANGES.txt ----------------------------------------------------------------------
