Merge and close #743
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c2e55c0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c2e55c0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c2e55c0f Branch: refs/heads/master Commit: c2e55c0f0ab9eb5818fc25a0a75457579554353f Parents: 3e11e3e 4c7be58 Author: Richard Downer <[email protected]> Authored: Mon Jul 27 11:24:25 2015 +0100 Committer: Richard Downer <[email protected]> Committed: Mon Jul 27 11:24:25 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/location/basic/os-details.sh | 12 +++++ .../location/jclouds/JcloudsLocation.java | 12 ++++- .../brooklyn/entity/AbstractEc2LiveTest.java | 6 +++ .../machine/MachineEntityEc2LiveTest.java | 57 ++++++++++++++++++++ .../rest/transform/LocationTransformer.java | 2 +- .../rest/resources/LocationResourceTest.java | 35 +++++++++--- 6 files changed, 115 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c2e55c0f/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java ----------------------------------------------------------------------
