Merge branch 'master' into relevance-and-other-composer-tweaks
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/bfde3e51 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/bfde3e51 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/bfde3e51 Branch: refs/heads/master Commit: bfde3e5106a90c5e5342e1a4d26d4e46d9027549 Parents: e20a8d1 777332a Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Nov 2 11:06:37 2018 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Nov 2 11:06:37 2018 +0000 ---------------------------------------------------------------------- .../providers/blueprint-loader-api.js | 37 ++++++++++ .../providers/blueprint-loader-api.provider.js | 71 ++++++++++++++++++++ ui-modules/blueprint-composer/app/index.js | 9 +-- .../app/views/main/main.controller.js | 20 +----- 4 files changed, 115 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
