Merge lp://qastaging/~hopem/charms/trusty/keystone/sync-charm-helpers-get-bool-from-str into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 119
Proposed branch: lp://qastaging/~hopem/charms/trusty/keystone/sync-charm-helpers-get-bool-from-str
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 851 lines (+575/-41)
12 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/python/packages.py (+2/-2)
hooks/charmhelpers/core/fstab.py (+2/-2)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/sysctl.py (+2/-2)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/charmhelpers/fetch/archiveurl.py (+10/-10)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
hooks/keystone_context.py (+13/-4)
hooks/keystone_hooks.py (+6/-3)
hooks/keystone_utils.py (+10/-13)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/keystone/sync-charm-helpers-get-bool-from-str
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+249801@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2030 keystone-next for hopem mp249801
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2030/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1820 keystone-next for hopem mp249801
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1820/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1968 keystone-next for hopem mp249801
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10254550/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1968/

120. By Edward Hope-Morley

re-sync ch

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2031 keystone-next for hopem mp249801
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2031/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1821 keystone-next for hopem mp249801
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1821/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1969 keystone-next for hopem mp249801
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1969/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2033 keystone-next for hopem mp249801
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2033/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1823 keystone-next for hopem mp249801
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1823/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #1971 keystone-next for hopem mp249801
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1971/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches