Merge lp:~james-page/charms/trusty/openstack-dashboard/lp1531102-trunk into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/trunk
Proposed by
James Page
on 2016-01-07
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 73 | ||||
Proposed branch: | lp:~james-page/charms/trusty/openstack-dashboard/lp1531102-trunk | ||||
Merge into: | lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/trunk | ||||
Diff against target: |
566 lines (+285/-26) 7 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) hooks/charmhelpers/contrib/openstack/utils.py (+21/-17) hooks/charmhelpers/core/host.py (+12/-1) hooks/charmhelpers/core/hugepage.py (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) |
||||
To merge this branch: | bzr merge lp:~james-page/charms/trusty/openstack-dashboard/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young | 2016-01-07 | Approve on 2016-01-08 | |
Review via email:
|
Commit message
Resync helpers
Description of the change
Resync stable helpers to resolve liberty version detection problems.
To post a comment you must log in.
charm_lint_check #16741 openstack-dashboard for james-page mp281874
LINT OK: passed
Build: http://
charm_amulet_test #8559 openstack-dashboard for james-page mp281874
AMULET OK: passed
Build: http://
charm_unit_test #15631 openstack-dashboard for james-page mp281874
UNIT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_unit_ test/15631/