Merge branch '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/7028f1e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7028f1e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7028f1e5 Branch: refs/heads/master Commit: 7028f1e513ff6f4159517a83e7cff1ebb9ce5db7 Parents: 6ba354d d2da431 Author: John Vines <vi...@apache.org> Authored: Thu Mar 6 16:23:53 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Thu Mar 6 16:23:53 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/conf/Interpolated.java | 5 ++++- .../main/java/org/apache/accumulo/core/conf/Property.java | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7028f1e5/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
