Merge lp://qastaging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/trunk
Proposed by
Chris Glass
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Chris Glass | ||||
Proposed branch: | lp://qastaging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/trunk | ||||
Diff against target: |
534 lines (+257/-53) 10 files modified
hooks/charmhelpers/cli/__init__.py (+1/-5) hooks/charmhelpers/cli/commands.py (+4/-4) hooks/charmhelpers/contrib/network/ip.py (+5/-3) hooks/charmhelpers/contrib/openstack/context.py (+8/-9) hooks/charmhelpers/contrib/openstack/templating.py (+2/-1) hooks/charmhelpers/contrib/openstack/utils.py (+7/-5) hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/hookenv.py (+1/-20) hooks/charmhelpers/core/host.py (+2/-2) |
||||
To merge this branch: | bzr merge lp://qastaging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
Description of the change
This syncs charm-helpers from lp:~openstack-charmers/charm-helpers/stable (using "make sync").
To post a comment you must log in.
Unmerged revisions
- 156. By Chris Glass
-
Updated charm-helpers again.
- 155. By Chris Glass
-
Updated charm-helpers from lp:~openstack-charmers/charm-helpers/stable
charm_lint_check #10249 keystone for tribaal mp271661
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/10249/