Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43b740bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43b740bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43b740bc Branch: refs/heads/1.8 Commit: 43b740bc77fd51e428328a2f1b4fef1c32c202d2 Parents: cd43958 8a35b6d Author: Mike Miller <mmil...@apache.org> Authored: Thu Nov 17 13:58:29 2016 -0500 Committer: Mike Miller <mmil...@apache.org> Committed: Thu Nov 17 13:58:29 2016 -0500 ---------------------------------------------------------------------- .../apache/accumulo/server/util/FileUtil.java | 6 +-- .../accumulo/server/util/FileUtilTest.java | 51 ++++---------------- 2 files changed, 12 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/43b740bc/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java ----------------------------------------------------------------------