Merge lp:~hopem/charms/trusty/ceph/lp1548478 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

Proposed by Edward Hope-Morley on 2016-02-22
Status: Merged
Merged at revision: 137
Proposed branch: lp:~hopem/charms/trusty/ceph/lp1548478
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 11 lines (+0/-1)
1 file modified
tests/basic_deployment.py (+0/-1)
To merge this branch: bzr merge lp:~hopem/charms/trusty/ceph/lp1548478
Reviewer Review Type Date Requested Status
OpenStack Charmers 2016-02-22 Pending
Review via email: mp+286836@code.launchpad.net
To post a comment you must log in.

charm_lint_check #1175 ceph-next for hopem mp286836
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1175/

charm_unit_test #1012 ceph-next for hopem mp286836
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1012/

charm_amulet_test #460 ceph-next for hopem mp286836
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/460/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2016-02-18 11:02:17 +0000
3+++ tests/basic_deployment.py 2016-02-22 20:24:55 +0000
4@@ -391,7 +391,6 @@
5 conf = '/etc/nova/nova.conf'
6 expected = {
7 'libvirt': {
8- 'rbd_pool': 'nova',
9 'rbd_user': 'nova-compute',
10 'rbd_secret_uuid': u.not_null
11 }

Subscribers

People subscribed via source and target branches