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 2014/11/15 18:07:15 UTC

[7/8] incubator-brooklyn git commit: This closes #333

This closes #333


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d121751
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d121751
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d121751

Branch: refs/heads/master
Commit: 0d12175136ecda62eb29076d59c94fadeb630d40
Parents: 2c7223b 7789158
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Nov 15 17:06:47 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Nov 15 17:06:47 2014 +0000

----------------------------------------------------------------------
 .../catalog/internal/BasicBrooklynCatalog.java  |  2 +-
 .../entity/rebind/BasicEntityRebindSupport.java |  6 ++--
 .../entity/rebind/dto/BasicEntityMemento.java   | 36 ++++++++++++++++----
 .../java/brooklyn/location/basic/Locations.java |  3 ++
 .../location/jclouds/JcloudsLocation.java       |  6 ++++
 .../jclouds/JcloudsLocationResolver.java        | 25 ++++++++------
 .../jclouds/JcloudsLocationResolverTest.java    | 18 ++++++++++
 .../software/MachineLifecycleEffectorTasks.java |  4 +--
 .../src/main/webapp/assets/js/view/catalog.js   | 21 +++++++++---
 9 files changed, 93 insertions(+), 28 deletions(-)
----------------------------------------------------------------------