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 71F42200B41 for ; Thu, 7 Jul 2016 11:23:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7081F160A72; Thu, 7 Jul 2016 09:23:04 +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 B7DF8160A68 for ; Thu, 7 Jul 2016 11:23:03 +0200 (CEST) Received: (qmail 53770 invoked by uid 500); 7 Jul 2016 09:23:03 -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 53756 invoked by uid 99); 7 Jul 2016 09:23:02 -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, 07 Jul 2016 09:23:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6626E05D9; Thu, 7 Jul 2016 09:23:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Thu, 07 Jul 2016 09:23:03 -0000 Message-Id: <79d62bfb64314f70834cf1ca16e2f3ac@git.apache.org> In-Reply-To: <230eb88c9ff14214a063c70572b1251a@git.apache.org> References: <230eb88c9ff14214a063c70572b1251a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] brooklyn-server git commit: This closes #194 archived-at: Thu, 07 Jul 2016 09:23:04 -0000 This closes #194 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/84fb623d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/84fb623d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/84fb623d Branch: refs/heads/master Commit: 84fb623d18868fb930eb112b9bfb682c7087ec10 Parents: 6a1eafc 11741d8 Author: Alex Heneveld Authored: Thu Jul 7 10:22:48 2016 +0100 Committer: Alex Heneveld Committed: Thu Jul 7 10:22:48 2016 +0100 ---------------------------------------------------------------------- .../camp/brooklyn/ExternalConfigYamlTest.java | 25 ++++ .../JcloudsLocationExternalConfigYamlTest.java | 124 +++++++++++++++++++ ...bstractCloudMachineProvisioningLocation.java | 12 +- .../location/ssh/SshMachineLocation.java | 16 +-- .../brooklyn/util/core/config/ConfigBag.java | 50 +++++++- .../location/jclouds/JcloudsLocation.java | 48 +++++-- .../jclouds/JcloudsSshMachineLocation.java | 3 +- 7 files changed, 250 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/84fb623d/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/84fb623d/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/84fb623d/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ----------------------------------------------------------------------