Merge branch 'cassandra-2.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/f95b40c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f95b40c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f95b40c1 Branch: refs/heads/trunk Commit: f95b40c1de385108b47e5aa32c0057c120e2ac03 Parents: 17055bf 24d8571 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 7 09:25:25 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Aug 7 09:25:25 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../DebuggableThreadPoolExecutor.java | 8 +- .../db/compaction/CompactionManager.java | 4 +- .../apache/cassandra/tools/SSTableExport.java | 131 +++++++++++-------- 4 files changed, 83 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/src/java/org/apache/cassandra/tools/SSTableExport.java ----------------------------------------------------------------------