You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/08/07 20:38:06 UTC

[4/6] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

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 <er...@gmail.com>
Authored: Thu Aug 7 14:14:23 2014 -0400
Committer: Eric C. Newton <er...@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(-)
----------------------------------------------------------------------