fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [2/2] incubator-fluo git commit: Merge branch 'fluo-700'
Date Fri, 08 Jul 2016 16:49:41 GMT
Merge branch 'fluo-700'


Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/16ded1c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/16ded1c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/16ded1c2

Branch: refs/heads/master
Commit: 16ded1c28780bd84c3cc3012e0a3825cc537c0ed
Parents: b2c91b9 d7e3617
Author: Mike Walch <mwalch@gmail.com>
Authored: Fri Jul 8 12:48:34 2016 -0400
Committer: Mike Walch <mwalch@gmail.com>
Committed: Fri Jul 8 12:48:34 2016 -0400

----------------------------------------------------------------------
 docs/applications.md                            |  16 +--
 docs/grafana.md                                 |  14 +--
 docs/metrics.md                                 |   6 +-
 .../org/apache/fluo/api/client/FluoAdmin.java   |   8 +-
 .../org/apache/fluo/api/client/FluoFactory.java |  30 +++--
 .../fluo/api/config/FluoConfiguration.java      |   6 +-
 .../apache/fluo/core/client/FluoAdminImpl.java  |   5 +-
 .../apache/fluo/core/metrics/MetricNames.java   |   8 +-
 .../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/scripts/fluo      |   2 +-
 .../org/apache/fluo/integration/log/LogIT.java  |  10 +-
 13 files changed, 112 insertions(+), 115 deletions(-)
----------------------------------------------------------------------



Mime
View raw message