Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4405411445 for ; Mon, 15 Sep 2014 22:58:00 +0000 (UTC) Received: (qmail 86641 invoked by uid 500); 15 Sep 2014 22:57:59 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 86618 invoked by uid 500); 15 Sep 2014 22:57:59 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 86609 invoked by uid 99); 15 Sep 2014 22:57:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 22:57:59 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 15 Sep 2014 22:57:35 +0000 Received: (qmail 84646 invoked by uid 99); 15 Sep 2014 22:57:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 22:57:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EB6C4A1491B; Mon, 15 Sep 2014 22:57:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Mon, 15 Sep 2014 22:57:39 -0000 Message-Id: In-Reply-To: <15edb4cbf8b84bcfb67d94b4693b4888@git.apache.org> References: <15edb4cbf8b84bcfb67d94b4693b4888@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] git commit: This closes #163 X-Virus-Checked: Checked by ClamAV on apache.org This closes #163 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/76d8ef4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/76d8ef4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/76d8ef4a Branch: refs/heads/master Commit: 76d8ef4a83f0b1b8151ae308fa517ed0f0b4eef9 Parents: 3976ea2 52e9103 Author: Alex Heneveld Authored: Mon Sep 15 23:57:10 2014 +0100 Committer: Alex Heneveld Committed: Mon Sep 15 23:57:10 2014 +0100 ---------------------------------------------------------------------- .../brooklyn/config/BrooklynProperties.java | 5 +- .../brooklyn/enricher/basic/Aggregator.java | 2 +- .../java/brooklyn/enricher/basic/Combiner.java | 2 +- .../brooklyn/enricher/basic/Propagator.java | 2 +- .../brooklyn/enricher/basic/Transformer.java | 2 +- .../DownloadProducerFromLocalRepo.java | 1 + .../drivers/downloads/FilenameProducers.java | 6 +- .../downloads/FilenameProducersTest.java | 2 +- .../java/brooklyn/enricher/DeltaEnricher.java | 4 +- .../brooklyn/enricher/HttpLatencyDetector.java | 2 +- .../brooklyn/enricher/RollingMeanEnricher.java | 4 +- .../enricher/RollingTimeWindowMeanEnricher.java | 4 +- .../enricher/TimeFractionDeltaEnricher.java | 4 +- .../enricher/TimeWeightedDeltaEnricher.java | 6 +- .../policy/ha/ServiceFailureDetector.java | 2 +- .../entity/brooklynnode/BrooklynNode.java | 8 +- .../brooklynnode/BrooklynNodeSshDriver.java | 19 +- .../BrooklynNodeIntegrationTest.java | 215 ++++++++----------- usage/cli/src/main/java/brooklyn/cli/Main.java | 12 ++ .../main/webapp/assets/js/libs/swagger-ui.js | 12 +- .../src/main/webapp/assets/js/view/apidoc.js | 4 +- .../src/main/webapp/assets/tpl/help/page.html | 2 +- .../src/main/webapp/assets/tpl/labs/page.html | 2 +- .../main/webapp/assets/tpl/script/groovy.html | 2 +- .../main/webapp/assets/tpl/script/swagger.html | 3 + .../brooklyn/launcher/BrooklynLauncher.java | 38 +++- ...nUserWithRandomPasswordSecurityProvider.java | 4 +- .../main/java/brooklyn/util/net/Networking.java | 19 ++ 28 files changed, 214 insertions(+), 174 deletions(-) ----------------------------------------------------------------------