lp:~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable

Branch merges

Propose for merging

No branches dependent on this one.

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

Liam Young (community): Approve on 2015-09-04

Diff: 194 lines (+19/-49)

7 files modified

hooks/charmhelpers/cli/__init__.py (+1/-5)
hooks/charmhelpers/cli/commands.py (+4/-4)
hooks/charmhelpers/contrib/openstack/utils.py (+7/-5)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/hookenv.py (+1/-20)
hooks/charmhelpers/core/host.py (+2/-2)
tests/basic_deployment.py (+1/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1489770: openstack_upgrade_available incorrectly always returns True for swift charms

High

Fix Released

Link a bug report

Related blueprints

72. By Adam Collard on 2015-09-03

Merge r79 from next, fix conflict

71. By Adam Collard on 2015-09-03

Sync from proposed stable charm-helpers branch

70. By Adam Collard on 2015-09-03

Initial sync of stable charm-helpers

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

66. By Liam Young on 2015-04-24

Point charmhelper sync and amulet tests at stable branches

65. By Liam Young on 2015-04-23

[gnuoy,trivial] Pre-release charmhelper sync

64. By Liam Young on 2015-04-19

[gnuoy,trivial] Pre-release charmhelper sync

63. By James Page on 2015-04-17

[beisner,r=james-page] auto normalize amulet test definitions and amulet make targets; charm-helper sync.