Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b63f7437 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b63f7437 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b63f7437 Branch: refs/heads/master Commit: b63f743757ab9e29a34430e525bbefbd77d85a94 Parents: 3e64bc9 351f199 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Apr 23 11:13:07 2015 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Apr 23 11:13:07 2015 -0400 ---------------------------------------------------------------------- .../compaction/MajorCompactionRequest.java | 15 +++++++++++++-- test/src/test/resources/TestCompactionStrat.jar | Bin 2259 -> 2530 bytes 2 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
