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/8d6b7299 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d6b7299 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d6b7299 Branch: refs/heads/1.8 Commit: 8d6b7299e4b3ee9b593f1b75d78164088c7402ae Parents: 7f865d2 4ba5faf Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Mar 27 19:47:46 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Mar 27 19:47:46 2017 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d6b7299/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------