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/bbc32290 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bbc32290 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bbc32290 Branch: refs/heads/master Commit: bbc3229071c7a6b5619dc23d573331a051531313 Parents: 0ebb604 31301c0 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Sep 9 14:54:49 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Sep 9 14:54:49 2016 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
