You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2016/07/14 18:12:17 UTC
[2/2] incubator-fluo git commit: Merge branch 'fluo-705'
Merge branch 'fluo-705'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/2f32661d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/2f32661d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/2f32661d
Branch: refs/heads/master
Commit: 2f32661daa789c41ae89cea61e76c56e1a70b4a1
Parents: b2c91b9 9e82f48
Author: Mike Walch <mw...@gmail.com>
Authored: Thu Jul 14 13:58:04 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Thu Jul 14 13:58:04 2016 -0400
----------------------------------------------------------------------
docs/applications.md | 16 +--
docs/grafana.md | 14 +--
docs/metrics.md | 6 +-
docs/prod-fluo-setup.md | 49 +++++---
.../org/apache/fluo/api/client/FluoAdmin.java | 8 +-
.../org/apache/fluo/api/client/FluoFactory.java | 30 +++--
.../fluo/api/config/FluoConfiguration.java | 6 +-
.../fluo/api/config/SimpleConfiguration.java | 2 +
.../apache/fluo/core/client/FluoAdminImpl.java | 5 +-
.../apache/fluo/core/metrics/MetricNames.java | 8 +-
modules/distribution/pom.xml | 9 --
modules/distribution/src/main/assembly/bin.xml | 72 +++---------
.../distribution/src/main/config/fluo-env.sh | 10 +-
.../src/main/config/fluo.properties | 116 +++++++++----------
modules/distribution/src/main/config/log4j.xml | 2 +-
.../distribution/src/main/config/logback.xml | 4 +-
modules/distribution/src/main/deps/README.md | 14 ---
modules/distribution/src/main/deps/pom.xml | 64 ----------
modules/distribution/src/main/lib/ahz/pom.xml | 77 ++++++++++++
modules/distribution/src/main/lib/fetch.sh | 113 ++++++++++++++++++
modules/distribution/src/main/scripts/fluo | 2 +-
.../org/apache/fluo/integration/log/LogIT.java | 10 +-
22 files changed, 353 insertions(+), 284 deletions(-)
----------------------------------------------------------------------