Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42e790df Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42e790df Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42e790df Branch: refs/heads/master Commit: 42e790dfa63ab7561daec93976cca5a476267ac4 Parents: 001ef47 2ab3055 Author: Eric Newton <[email protected]> Authored: Wed Sep 18 13:29:26 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Wed Sep 18 13:29:26 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/tabletserver/CompactionWatcher.java | 3 ++- .../java/org/apache/accumulo/server/tabletserver/Compactor.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
