Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58911cc8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58911cc8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58911cc8 Branch: refs/heads/master Commit: 58911cc8e2277a4b192673217aaf996216a0898c Parents: 139f489 81b6d5b Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Nov 13 06:57:46 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Nov 13 06:57:46 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/conf/Property.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/58911cc8/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
