Juju Charms Collection
keystone package

Merge lp://qastaging/~corey.bryant/charms/trusty/keystone/sync-ch into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

  1. Trusty Tahr (14.04)
  2. sync-ch
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 163
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/keystone/sync-ch
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 968 lines (+475/-145)
14 files modified
config.yaml (+1/-1)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49)
hooks/charmhelpers/contrib/openstack/context.py (+8/-7)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6)
hooks/charmhelpers/contrib/openstack/utils.py (+9/-5)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6)
hooks/charmhelpers/core/hookenv.py (+93/-36)
hooks/charmhelpers/core/host.py (+31/-5)
hooks/charmhelpers/core/services/base.py (+12/-9)
hooks/charmhelpers/core/services/helpers.py (+2/-2)
hooks/charmhelpers/fetch/__init__.py (+23/-14)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/keystone/sync-ch
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+265048@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 #6286 keystone-next for corey.bryant mp265048
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11889711/
Build: http://10.245.162.77:8080/job/charm_lint_check/6286/

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

charm_unit_test #5918 keystone-next for corey.bryant mp265048
    UNIT OK: passed

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

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

charm_amulet_test #5141 keystone-next for corey.bryant mp265048
    AMULET OK: passed

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

lp://qastaging/~corey.bryant/charms/trusty/keystone/sync-ch updated
164. By Corey Bryant

Fix lint error in config.yaml

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

charm_lint_check #6341 keystone-next for corey.bryant mp265048
    LINT OK: passed

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

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

charm_unit_test #5973 keystone-next for corey.bryant mp265048
    UNIT OK: passed

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

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

charm_amulet_test #5151 keystone-next for corey.bryant mp265048
    AMULET OK: passed

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

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