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/2b5b54be Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b5b54be Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b5b54be Branch: refs/heads/master Commit: 2b5b54bec3de245b3e895ee8ffafeb141f77df46 Parents: c521cf8 08d279f Author: Dave Marion <dlmar...@apache.org> Authored: Tue Jun 14 14:21:02 2016 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Tue Jun 14 14:21:02 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/conf/PropertyType.java | 11 ++++------- .../accumulo/core/conf/AccumuloConfigurationTest.java | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b5b54be/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java ----------------------------------------------------------------------
