Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eab163dc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eab163dc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eab163dc Branch: refs/heads/master Commit: eab163dcfd9c8eda422d8d0da6b757efba90abdf Parents: b5227cf 39260cb Author: Keith Turner <ktur...@apache.org> Authored: Tue Dec 3 12:20:30 2013 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Dec 3 12:20:30 2013 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/conf/Property.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eab163dc/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
