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/25af3a3a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25af3a3a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25af3a3a Branch: refs/heads/master Commit: 25af3a3a5fbb2dbdb6c33ada7cc2f38677eae9e7 Parents: 794ec90 5960cfe Author: Josh Elser <els...@apache.org> Authored: Fri Dec 18 14:07:15 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Dec 18 14:07:15 2015 -0500 ---------------------------------------------------------------------- .../accumulo/server/util/FileSystemMonitor.java | 45 +++++++--- .../server/util/FileSystemMonitorTest.java | 87 ++++++++++++++++++++ 2 files changed, 122 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
