lp:~1chb1n/charms/trusty/swift-storage/15.10-stable-flip-tests-helper-syncs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk at revision 75

Corey Bryant (community): Approve on 2015-10-22

Diff: 32 lines (+3/-3)

3 files modified

charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
tests/basic_deployment.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

76. By Ryan Beisner on 2015-10-22

flip charmhelper sync branches to stable

75. By Ryan Beisner on 2015-10-22

flip amulet stable to True

74. By James Page on 2015-10-22

15.10 Charm release

73. By Liam Young on 2015-10-07

[gnuoy, trivial] fix charm prrof lint

72. By Liam Young on 2015-10-07

[tribaal, r=gnuoy] This is a backport of the fixes introduced in https://code.launchpad.net/~gnuoy/charms/trusty/swift-storage/lp1496004/+merge/273209 .

Note that the only difference in terms of diff is that the swift_storage_utils.py file is in the hooks folder here instead of the lib/ folder in the -next branch.

71. By Liam Young on 2015-09-23

Charmhelper sync

70. By Liam Young on 2015-09-04

[adam-collard, r=gnuoy] Backport r436 to stable.

This branch prevents the swift-storage charm from thinking there was an OpenStack upgrade available at every config-changed.

I had to update the Amulet tests because they were incorrectly asserting that all of the swift services should have been restarted following a change to object-server-threads-per-disk. In fact, only the object services should be restarted, and only are (the test passed prior to this because of the bug in charm-helpers which caused the unconditional OpenStack upgrade, in turn restarting all of the services)

69. By Corey Bryant on 2015-08-10

[beisner,r=corey.bryant] Point charmhelper sync and amulet tests at stable branches.

68. By James Page on 2015-08-10

[gnuoy] 15.07 Charm release

67. By Liam Young on 2015-07-02

[jjo, r=gnuoy] fix nrpe SWIFT_SVCS for swift- prefix, fixes lp#1470641