Merge lp:~1chb1n/charms/trusty/swift-storage/15.10-stable-flip-tests-helper-syncs into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

[Ryan Beisner]

Flip next:stable bits for amulet tests and c-h sync yamls.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12345 swift-storage for 1chb1n mp275411
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11493 swift-storage for 1chb1n mp275411
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12388 swift-storage for 1chb1n mp275411
    LINT OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-10-22 13:25:25 +0000
+++ charm-helpers-hooks.yaml	2015-10-22 16:30:06 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: charmhelpers
 include:
     - core
 
=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-10-22 13:25:25 +0000
+++ charm-helpers-tests.yaml	2015-10-22 16:30:06 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-22 13:25:25 +0000
+++ tests/basic_deployment.py	2015-10-22 16:30:06 +0000
@@ -19,7 +19,7 @@
 class SwiftStorageBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic swift-storage deployment."""
 
-    def __init__(self, series, openstack=None, source=None, stable=False):
+    def __init__(self, series, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(SwiftStorageBasicDeployment, self).__init__(series, openstack,
                                                           source, stable)