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/31301c0f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31301c0f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31301c0f Branch: refs/heads/master Commit: 31301c0f562c3d14be24d3fe89eb0cc4c5bb60e3 Parents: 64fc0b7 5761d01 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Sep 9 14:52:28 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Sep 9 14:52:28 2016 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/31301c0f/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
