Merge lp:~1chb1n/charms/trusty/rabbitmq-server/15.10-stable-flip-tests-helper-syncs into lp:charms/trusty/rabbitmq-server

[Ryan Beisner]

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

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

charm_unit_test #11443 rabbitmq-server for 1chb1n mp275409
    UNIT OK: passed

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

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

charm_lint_check #12365 rabbitmq-server for 1chb1n mp275409
    LINT OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-10-22 13:24:30 +0000
+++ charm-helpers-hooks.yaml	2015-10-22 16:29:55 +0000
@@ -1,5 +1,5 @@
 destination: hooks/charmhelpers
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 include:
     - fetch
     - core

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-10-22 13:24:30 +0000
+++ charm-helpers-tests.yaml	2015-10-22 16:29:55 +0000
@@ -1,5 +1,5 @@
 destination: tests/charmhelpers
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 include:
     - contrib.amulet
     - contrib.openstack.amulet

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-22 13:24:30 +0000
+++ tests/basic_deployment.py	2015-10-22 16:29:55 +0000
@@ -32,7 +32,7 @@
     """Amulet tests on a basic rabbitmq cluster deployment. Verify
        relations, service status, users and endpoint service catalog."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(RmqBasicDeployment, self).__init__(series, openstack, source,
                                                  stable)