Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/faa3fc2b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/faa3fc2b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/faa3fc2b Branch: refs/heads/master Commit: faa3fc2b421c295f14c659d71dd4b09ba91ef7b5 Parents: 611a1a3 d440049 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Aug 7 14:14:23 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Aug 7 14:14:23 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/Property.java | 2 ++ .../main/asciidoc/chapters/administration.txt | 5 ++++ .../accumulo/monitor/EmbeddedWebServer.java | 27 ++++++++++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
