Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/contrib.python.packages into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 64 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/neutron-api/contrib.python.packages |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
3322 lines (+1045/-524) 27 files modified
charm-helpers-sync.yaml (+1/-0) hooks/charmhelpers/__init__.py (+22/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+16/-7) hooks/charmhelpers/contrib/network/ip.py (+52/-50) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1) hooks/charmhelpers/contrib/openstack/context.py (+319/-226) hooks/charmhelpers/contrib/openstack/ip.py (+41/-27) hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-2) hooks/charmhelpers/contrib/openstack/templating.py (+5/-5) hooks/charmhelpers/contrib/openstack/utils.py (+146/-13) hooks/charmhelpers/contrib/python/packages.py (+77/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+89/-102) hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4) hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/fstab.py (+10/-8) hooks/charmhelpers/core/hookenv.py (+41/-15) hooks/charmhelpers/core/host.py (+51/-20) hooks/charmhelpers/core/services/__init__.py (+2/-2) hooks/charmhelpers/core/services/helpers.py (+9/-5) hooks/charmhelpers/core/templating.py (+2/-1) hooks/charmhelpers/fetch/__init__.py (+18/-12) hooks/charmhelpers/fetch/archiveurl.py (+53/-16) hooks/charmhelpers/fetch/bzrurl.py (+5/-1) hooks/charmhelpers/fetch/giturl.py (+51/-0) |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/contrib.python.packages |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #165 neutron-api-next for corey.bryant mp244325
LINT OK: passed
Build: http:// 10.230. 18.80:8080/ job/charm_ lint_check/ 165/