You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/30 16:00:27 UTC
[50/50] brooklyn-server git commit: Merge branch 'master' into
all-osgi
Merge branch 'master' into all-osgi
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b8aa4c29
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b8aa4c29
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b8aa4c29
Branch: refs/heads/master
Commit: b8aa4c29e674c92a36c10e0c9072b1ca7e6a9cd2
Parents: 5560434 c6b4372
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Mar 30 14:53:18 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Mar 30 14:53:18 2016 +0100
----------------------------------------------------------------------
.../camp/brooklyn/LocationsYamlTest.java | 2 +-
.../location/byon/ByonLocationResolver.java | 7 +-
.../FixedListMachineProvisioningLocation.java | 51 ++++++++++---
.../brooklyn/location/multi/MultiLocation.java | 79 +++++++++++---------
.../location/multi/MultiLocationResolver.java | 2 +-
.../location/byon/ByonLocationResolverTest.java | 27 ++++++-
.../multi/MultiLocationResolverTest.java | 19 ++++-
7 files changed, 132 insertions(+), 55 deletions(-)
----------------------------------------------------------------------