Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5371f99 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5371f99 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5371f99 Branch: refs/heads/master Commit: f5371f99d8473bb47a30025c0b214ba1f4044cd0 Parents: e4a381d d99158f Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jun 12 15:06:46 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jun 12 15:06:46 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/SiteConfigurationTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5371f99/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java ----------------------------------------------------------------------
