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 8CF88200B96 for ; Thu, 6 Oct 2016 18:18:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8BCF0160AED; Thu, 6 Oct 2016 16:18:25 +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 A7E8A160AE0 for ; Thu, 6 Oct 2016 18:18:24 +0200 (CEST) Received: (qmail 61965 invoked by uid 500); 6 Oct 2016 16:18:23 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 61926 invoked by uid 99); 6 Oct 2016 16:18:23 -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, 06 Oct 2016 16:18:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C78DE02E4; Thu, 6 Oct 2016 16:18:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.apache.org Date: Thu, 06 Oct 2016 16:18:25 -0000 Message-Id: <080d7531793d4aeaadb60b9edbcac054@git.apache.org> In-Reply-To: <1817af2fa1e0491d8b0fa484d503eee3@git.apache.org> References: <1817af2fa1e0491d8b0fa484d503eee3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] brooklyn-server git commit: This closes #371 archived-at: Thu, 06 Oct 2016 16:18:25 -0000 This closes #371 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bc494238 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bc494238 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bc494238 Branch: refs/heads/master Commit: bc49423805ee70758ec7f5b11849bff8ecdd51f1 Parents: 717fe35 a5470a8 Author: Aled Sage Authored: Thu Oct 6 17:17:43 2016 +0100 Committer: Aled Sage Committed: Thu Oct 6 17:17:43 2016 +0100 ---------------------------------------------------------------------- .../api/location/MachineLocationCustomizer.java | 5 + .../ConfigLocationInheritanceYamlTest.java | 8 +- ...loudsCustomizerInstantiationYamlDslTest.java | 221 +++++++++++++++++++ .../command/support/CloudExplorerSupport.java | 30 ++- .../location/jclouds/JcloudsLocation.java | 32 +-- .../location/jclouds/JcloudsLocationConfig.java | 4 +- .../jclouds/JcloudsLocationCustomizer.java | 16 +- .../jclouds/BailOutJcloudsLocation.java | 9 +- 8 files changed, 287 insertions(+), 38 deletions(-) ----------------------------------------------------------------------