Merge branch 'pr-149' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/726aa1d4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/726aa1d4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/726aa1d4 Branch: refs/heads/1.7 Commit: 726aa1d4c8fed237f2eae8c4cd026683f9a7c500 Parents: 768a73c 0ecc471 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Sep 9 14:47:15 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Sep 9 14:47:15 2016 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
