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

[Ryan Beisner]

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

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

charm_unit_test #11442 percona-cluster for 1chb1n mp275408
    UNIT OK: passed

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

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

charm_lint_check #12363 percona-cluster for 1chb1n mp275408
    LINT OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

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

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-10-22 13:26:22 +0000
+++ charm-helpers-tests.yaml	2015-10-22 16:29:49 +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:26:22 +0000
+++ tests/basic_deployment.py	2015-10-22 16:29:49 +0000
@@ -11,7 +11,7 @@
 
 class BasicDeployment(OpenStackAmuletDeployment):
     def __init__(self, vip=None, units=1, series="trusty", openstack=None,
-                 source=None, stable=False):
+                 source=None, stable=True):
         super(BasicDeployment, self).__init__(series, openstack, source,
                                               stable)
         self.units = units