Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5761d012 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5761d012 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5761d012 Branch: refs/heads/1.8 Commit: 5761d0121da1a1a0155888f8428a3f0a2b1f68a1 Parents: e08b538 726aa1d Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Sep 9 14:50:13 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Sep 9 14:50:13 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/5761d012/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
