You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/23 18:57:34 UTC
[49/50] [abbrv] git commit: Merge
99b9e19bfbb406f30d1e6c05bcc52ccdc4acdc87 into
1c9ae9245088e6904c4ed66ec1f592e2588e6f8e
Merge 99b9e19bfbb406f30d1e6c05bcc52ccdc4acdc87 into 1c9ae9245088e6904c4ed66ec1f592e2588e6f8e
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3114bfa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3114bfa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3114bfa8
Branch: refs/pull/1414/merge
Commit: 3114bfa88395fd5b0373ce0453f9b1278362ac39
Parents: 1c9ae92 99b9e19
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 23 16:36:34 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 23 16:36:34 2014 +0000
----------------------------------------------------------------------
.../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 +++++++++++++++++++-
.../brooklyn/util/math/MathFunctionsTest.java | 18 +++++++++++++++
7 files changed, 67 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3114bfa8/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------