Juju Charms Collection
keystone package

Merge lp://staging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers into lp://staging/~openstack-charmers-archive/charms/trusty/keystone/trunk

  1. Trusty Tahr (14.04)
  2. update-stable-charm-helpers
  3. Merge into trunk
Proposed by Chris Glass
Status: Rejected
Rejected by: Chris Glass
Proposed branch: lp://staging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers
Merge into: lp://staging/~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://staging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+271661@code.staging.launchpad.net

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.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #10249 keystone for tribaal mp271661
    LINT OK: passed

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

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

charm_unit_test #9405 keystone for tribaal mp271661
    UNIT OK: passed

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

lp://staging/~tribaal/charms/trusty/keystone/update-stable-charm-helpers updated
156. By Chris Glass

Updated charm-helpers again.

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

charm_amulet_test #6491 keystone for tribaal mp271661
    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://paste.ubuntu.com/12449164/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6491/

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

charm_lint_check #10251 keystone for tribaal mp271661
    LINT OK: passed

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

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

charm_unit_test #9406 keystone for tribaal mp271661
    UNIT OK: passed

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

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

charm_amulet_test #6493 keystone for tribaal mp271661
    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://paste.ubuntu.com/12449437/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6493/

Unmerged revisions

156. By Chris Glass

Updated charm-helpers again.

155. By Chris Glass

Updated charm-helpers from lp:~openstack-charmers/charm-helpers/stable

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