Merge lp:~corey.bryant/charms/trusty/ceph-radosgw/use-stable into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk

Proposed by Corey Bryant
Status: Merged
Merged at revision: 31
Proposed branch: lp:~corey.bryant/charms/trusty/ceph-radosgw/use-stable
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
tests/basic_deployment.py (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/ceph-radosgw/use-stable
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+239476@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py 2014-09-29 01:57:43 +0000
+++ tests/basic_deployment.py 2014-10-23 20:17:04 +0000
@@ -17,7 +17,7 @@
17class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):17class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
18 """Amulet tests on a basic ceph-radosgw deployment."""18 """Amulet tests on a basic ceph-radosgw deployment."""
1919
20 def __init__(self, series=None, openstack=None, source=None, stable=False):20 def __init__(self, series=None, openstack=None, source=None, stable=True):
21 """Deploy the entire test environment."""21 """Deploy the entire test environment."""
22 super(CephRadosGwBasicDeployment, self).__init__(series, openstack,22 super(CephRadosGwBasicDeployment, self).__init__(series, openstack,
23 source, stable)23 source, stable)

Subscribers

People subscribed via source and target branches