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/0a0be0f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0be0f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0be0f6 Branch: refs/heads/master Commit: 0a0be0f6b05e70d49949d9a623201ff357211644 Parents: a504b16 f9a196f Author: Josh Elser <els...@apache.org> Authored: Tue Feb 11 13:41:10 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Feb 11 13:41:10 2014 -0500 ---------------------------------------------------------------------- .../1GB/native-standalone/accumulo-env.sh | 1 - conf/examples/1GB/standalone/accumulo-env.sh | 1 - .../2GB/native-standalone/accumulo-env.sh | 1 - conf/examples/2GB/standalone/accumulo-env.sh | 1 - .../3GB/native-standalone/accumulo-env.sh | 1 - conf/examples/3GB/standalone/accumulo-env.sh | 1 - .../512MB/native-standalone/accumulo-env.sh | 1 - conf/examples/512MB/standalone/accumulo-env.sh | 1 - .../org/apache/accumulo/core/Constants.java | 6 +- .../org/apache/accumulo/core/conf/Property.java | 2 + .../apache/accumulo/core/util/MonitorUtil.java | 4 +- .../org/apache/accumulo/server/Accumulo.java | 77 +---- .../apache/accumulo/server/init/Initialize.java | 2 + .../accumulo/server/monitor/LogService.java | 39 ++- .../server/watcher/MonitorLog4jWatcher.java | 154 +++++++++ .../org/apache/accumulo/monitor/Monitor.java | 319 +++++++++++++------ 16 files changed, 432 insertions(+), 179 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a0be0f6/core/src/main/java/org/apache/accumulo/core/conf/Property.java ----------------------------------------------------------------------
