Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4611077 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4611077 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4611077 Branch: refs/heads/ACCUMULO-378 Commit: f4611077021b85d2988e7307de980ab4a441f96a Parents: 3411023 480634f Author: Josh Elser <els...@apache.org> Authored: Fri May 23 16:32:29 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 23 16:32:29 2014 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4611077/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
