Merge lp://qastaging/~thedac/charms/trusty/neutron-api/object-complete-context into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Proposed by
David Ames
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~thedac/charms/trusty/neutron-api/object-complete-context |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk |
| Diff against target: |
3140 lines (+1381/-247) (has conflicts) 28 files modified
README.md (+83/-0) config.yaml (+7/-4) hooks/charmhelpers/contrib/hahelpers/cluster.py (+46/-2) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) hooks/charmhelpers/contrib/openstack/context.py (+47/-8) hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9) hooks/charmhelpers/contrib/openstack/templating.py (+23/-1) hooks/charmhelpers/contrib/openstack/utils.py (+172/-23) hooks/charmhelpers/contrib/python/packages.py (+30/-5) hooks/charmhelpers/core/hookenv.py (+232/-38) hooks/charmhelpers/core/host.py (+25/-7) hooks/charmhelpers/core/services/base.py (+32/-11) hooks/charmhelpers/fetch/__init__.py (+1/-1) hooks/charmhelpers/fetch/giturl.py (+7/-5) hooks/neutron_api_context.py (+16/-12) hooks/neutron_api_hooks.py (+25/-1) hooks/neutron_api_utils.py (+45/-1) metadata.yaml (+1/-1) templates/git/upstart/neutron-server.upstart (+1/-1) templates/icehouse/ml2_conf.ini (+2/-2) templates/kilo/ml2_conf.ini (+2/-2) tests/basic_deployment.py (+140/-85) tests/charmhelpers/contrib/amulet/utils.py (+91/-6) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) tests/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) unit_tests/test_neutron_api_context.py (+24/-10) unit_tests/test_neutron_api_utils.py (+57/-2) Text conflict in README.md Text conflict in hooks/charmhelpers/contrib/hahelpers/cluster.py |
| To merge this branch: | bzr merge lp://qastaging/~thedac/charms/trusty/neutron-api/object-complete-context |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-07-21.
Commit message
Set workload-status in the neutron-api charm
Description of the change
A more object oriented approach to setting workload status
To post a comment you must log in.
Unmerged revisions
- 139. By David Ames
-
[thedac, trivial] s/message/messaging
- 138. By David Ames
-
Pull in upstream
- 137. By David Ames
-
Track neutron-plugin-api
- 136. By David Ames
-
Use check_optional_
relations - 135. By David Ames
-
Fix unit tests
- 134. By David Ames
-
Unit is ready
- 133. By David Ames
-
More renames
- 132. By David Ames
-
Rename incomplete_contexts incomplete_
relation_ data - 131. By David Ames
-
Renames and add ha check for vip settings
- 130. By David Ames
-
Merge Upstream
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
