Merge lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings into lp://staging/~sdn-charmers/charms/trusty/openstack-dashboard/add-settings
Proposed by
Michał Sawicz
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings |
| Merge into: | lp://staging/~sdn-charmers/charms/trusty/openstack-dashboard/add-settings |
| Diff against target: |
5131 lines (+2708/-679) 45 files modified
charm-helpers-hooks.yaml (+1/-0) config.yaml (+25/-18) hooks/charmhelpers/cli/__init__.py (+191/-0) hooks/charmhelpers/cli/benchmark.py (+36/-0) hooks/charmhelpers/cli/commands.py (+32/-0) hooks/charmhelpers/cli/hookenv.py (+23/-0) hooks/charmhelpers/cli/host.py (+31/-0) hooks/charmhelpers/cli/unitdata.py (+39/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+47/-3) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+43/-6) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51) hooks/charmhelpers/contrib/openstack/context.py (+69/-48) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) hooks/charmhelpers/contrib/openstack/neutron.py (+40/-20) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6) hooks/charmhelpers/contrib/openstack/templating.py (+13/-98) hooks/charmhelpers/contrib/openstack/utils.py (+139/-38) hooks/charmhelpers/contrib/python/packages.py (+30/-5) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6) hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-3) hooks/charmhelpers/core/files.py (+45/-0) hooks/charmhelpers/core/hookenv.py (+331/-42) hooks/charmhelpers/core/host.py (+119/-17) hooks/charmhelpers/core/hugepage.py (+62/-0) hooks/charmhelpers/core/services/base.py (+43/-19) hooks/charmhelpers/core/services/helpers.py (+18/-2) hooks/charmhelpers/core/unitdata.py (+61/-17) hooks/charmhelpers/fetch/__init__.py (+32/-15) hooks/charmhelpers/fetch/archiveurl.py (+7/-1) hooks/charmhelpers/fetch/giturl.py (+8/-6) hooks/horizon_contexts.py (+0/-26) hooks/horizon_hooks.py (+2/-3) hooks/horizon_utils.py (+40/-31) templates/git/dashboard.conf (+1/-0) templates/icehouse/_{}_juju_{}.py (+0/-2) tests/00-setup (+1/-0) tests/018-basic-utopic-juno (+0/-9) tests/052-basic-trusty-kilo-git (+12/-0) tests/basic_deployment.py (+52/-15) tests/charmhelpers/contrib/amulet/utils.py (+282/-9) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+43/-6) tests/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51) unit_tests/test_horizon_contexts.py (+0/-28) unit_tests/test_horizon_hooks.py (+2/-2) unit_tests/test_horizon_utils.py (+1/-32) |
| To merge this branch: | bzr merge lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| SDN Charmers | Pending | ||
|
Review via email:
|
|||
Commit message
Let plugin subordinates handle the plugin files themselves
To post a comment you must log in.
Unmerged revisions
- 84. By Michał Sawicz
-
Merge next
- 83. By Michał Sawicz
-
Drop empty line
- 82. By Michał Sawicz
-
Undo test changes
- 81. By Michał Sawicz
-
Revert support for plugin files, let subordinates write those themselves
- 80. By Michał Sawicz
-
Revert charmhelpers' pattern support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
