Merge lp:~james-page/charms/trusty/keystone/lp1531102 into lp:~openstack-charmers-archive/charms/trusty/keystone/next
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 195 | ||||
Proposed branch: | lp:~james-page/charms/trusty/keystone/lp1531102 | ||||
Merge into: | lp:~openstack-charmers-archive/charms/trusty/keystone/next | ||||
Diff against target: |
271 lines (+129/-42) 3 files modified
charmhelpers/contrib/openstack/utils.py (+27/-25) charmhelpers/core/host.py (+34/-17) charmhelpers/core/kernel.py (+68/-0) |
||||
To merge this branch: | bzr merge lp:~james-page/charms/trusty/keystone/lp1531102 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | 2016-01-05 | Pending | |
Review via email:
|
Commit message
Resync helpers
Description of the change
Resync helpers.
charm_amulet_test #8516 keystone-next for james-page mp281615
AMULET FAIL: amulet-test failed
AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.
Full amulet test output: http://
Build: http://
charm_amulet_test #8536 keystone-next for james-page mp281615
AMULET FAIL: amulet-test failed
AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.
Full amulet test output: http://
Build: http://
- 196. By James Page on 2016-01-07
-
Resync helpers to resolve systemd related amulet test failures.
charm_lint_check #16722 keystone-next for james-page mp281615
LINT OK: passed
Build: http://
charm_unit_test #15619 keystone-next for james-page mp281615
UNIT OK: passed
charm_amulet_test #8549 keystone-next for james-page mp281615
AMULET OK: passed
Build: http://
charm_lint_check #16597 keystone-next for james-page mp281615
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/16597/