[5/8] accumulo git commit: Merge branch '1.6' into 1.7

[elserj]

Merge branch '1.6' into 1.7

Conflicts:
        
server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b83b4ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b83b4ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b83b4ab

Branch: refs/heads/master
Commit: 8b83b4ab0035a140db64bcbb583fe6f168ee0ee3
Parents: f51e6b0 d3d825b
Author: Josh Elser <els...@apache.org>
Authored: Thu Dec 17 17:14:57 2015 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Thu Dec 17 17:14:57 2015 -0500

----------------------------------------------------------------------
 .../accumulo/server/util/FileSystemMonitor.java | 46 +++++++--
 .../server/util/FileSystemMonitorTest.java      | 98 ++++++++++++++++++++
 2 files changed, 134 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b83b4ab/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 9bc37d8,e2e1d46..93d6397
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@@ -90,9 -116,8 +116,9 @@@ public class FileSystemMonitor 
            checkMounts(procFile);
          } catch (final Exception e) {
            Halt.halt(-42, new Runnable() {
 +            @Override
              public void run() {
-               log.fatal("Exception while checking mount points, halting 
process", e);
+               log.error("Exception while checking mount points, halting 
process", e);
              }
            });
          }