Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EB5BE200B44 for ; Thu, 14 Jul 2016 20:12:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E787C160A89; Thu, 14 Jul 2016 18:12:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3C6CE160A63 for ; Thu, 14 Jul 2016 20:12:21 +0200 (CEST) Received: (qmail 37728 invoked by uid 500); 14 Jul 2016 18:12:20 -0000 Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fluo.incubator.apache.org Delivered-To: mailing list commits@fluo.incubator.apache.org Received: (qmail 37690 invoked by uid 99); 14 Jul 2016 18:12:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 18:12:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E63091A004D for ; Thu, 14 Jul 2016 18:12:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id l780ewgWde9S for ; Thu, 14 Jul 2016 18:12:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 3D47160D10 for ; Thu, 14 Jul 2016 18:12:17 +0000 (UTC) Received: (qmail 37632 invoked by uid 99); 14 Jul 2016 18:12:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 18:12:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FC3ADFDCE; Thu, 14 Jul 2016 18:12:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mwalch@apache.org To: commits@fluo.incubator.apache.org Date: Thu, 14 Jul 2016 18:12:17 -0000 Message-Id: <26750bba28074da3b560812b29a60fd1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-fluo git commit: Merge branch 'fluo-705' archived-at: Thu, 14 Jul 2016 18:12:22 -0000 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 Authored: Thu Jul 14 13:58:04 2016 -0400 Committer: Mike Walch 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(-) ----------------------------------------------------------------------