This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from d94ba70 Merge pull request #225 from
algairim/fix/smart-121-catalog-overrides-proposal
new 1e3f877 Merge commit '612ba96834671381eab7b981231b1c4861dfea23' into
fix/smart-121-part-3
new 93060b6 Merge branch 'master' into fix/smart-121-part-3
new fd1ccc3 integrated and updated mykola's changes
new 46e6fae Fixed override ql deps
new 25f6aa6 removed deps on QL overrider
new f2518c2 Merge pull request #226 from iuliana/fix/smart-121-part-3
The 1960 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui-modules/catalog/app/index.js | 2 +-
ui-modules/catalog/app/views/bundle/type/type.state.js | 7 +++----
ui-modules/home/app/index.js | 6 +++++-
.../providers/quick-launch-overrides.provider.js | 0
4 files changed, 9 insertions(+), 6 deletions(-)
rename ui-modules/{catalog/app/components =>
utils}/providers/quick-launch-overrides.provider.js (100%)