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 D57BA108AD for ; Tue, 27 May 2014 08:35:39 +0000 (UTC) Received: (qmail 68791 invoked by uid 500); 27 May 2014 08:35:39 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 68765 invoked by uid 500); 27 May 2014 08:35:39 -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 68746 invoked by uid 99); 27 May 2014 08:35:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 08:35:39 +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; Tue, 27 May 2014 08:35:40 +0000 Received: (qmail 68474 invoked by uid 99); 27 May 2014 08:35:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 08:35:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 20B8A9A6690; Tue, 27 May 2014 08:35:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 27 May 2014 08:35:21 -0000 Message-Id: <8054e6f0a3df48ae96b852b13c7df62e@git.apache.org> In-Reply-To: <786b99d4ac744cb5b141d2867d2ac8fb@git.apache.org> References: <786b99d4ac744cb5b141d2867d2ac8fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] git commit: Merge pull request #1414 from ahgittin/misc X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #1414 from ahgittin/misc a few minor fixes/tweaks, including OS_FAMILY support in yaml Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c79fda00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c79fda00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c79fda00 Branch: refs/heads/master Commit: c79fda005212e0f8d7003cc7093a1d46bf4b0fb1 Parents: 48df48a 7a6827e Author: Alex Heneveld Authored: Mon May 26 15:56:23 2014 +0100 Committer: Alex Heneveld Committed: Mon May 26 15:56:23 2014 +0100 ---------------------------------------------------------------------- .../location/jclouds/JcloudsLocation.java | 16 ++++++++++++- .../location/jclouds/JcloudsLocationConfig.java | 7 +++++- .../entity/brooklynnode/BrooklynNode.java | 3 ++- .../java/brooklyn/entity/java/JavaAppUtils.java | 5 ++-- usage/cli/src/main/java/brooklyn/cli/Main.java | 2 +- .../java/brooklyn/util/math/MathFunctions.java | 24 +++++++++++++++++++- .../main/java/brooklyn/util/text/Strings.java | 4 +++- .../brooklyn/util/math/MathFunctionsTest.java | 24 ++++++++++++++++++++ .../java/brooklyn/util/text/StringsTest.java | 18 +++++++++++++++ 9 files changed, 94 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c79fda00/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java ----------------------------------------------------------------------