lp:~bac/charms/oneiric/buildbot-master/bbm-bugs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~yellow/charms/oneiric/buildbot-master/trunk at revision 17

Gary Poster (community): Approve on 2012-02-08

Yellow Squad: Pending (code) requested 2012-02-08

Diff: 286 lines (+78/-27)

7 files modified

hooks/buildbot-relation-changed (+21/-9)
hooks/config-changed (+11/-5)
hooks/helpers.py (+17/-5)
hooks/install (+7/-2)
hooks/local.py (+4/-0)
hooks/start (+9/-3)
hooks/stop (+9/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

21. By Brad Crittenden on 2012-02-08

Changes from Graham's branch I forgot to make before merging to trunk.

20. By Brad Crittenden on 2012-02-08

Merge from trunk

19. By Brad Crittenden on 2012-02-08

Move the serialization of slaves to the right damned place.

18. By Brad Crittenden on 2012-02-08

Non-working attempt to get slave-master relation running.

17. By Brad Crittenden on 2012-02-08

Fix slave name/passwd issue

16. By Brad Crittenden on 2012-02-08

Merged in logging changes

15. By Francesco Banconi on 2012-02-08

[r=frankban] Relation changed hook called twice. Extra packages and slave_info.json fixes.

14. By Gary Poster on 2012-02-07

[r=gary] fix string in config-changed

13. By Francesco Banconi on 2012-02-07

Merged branch dynamic-relationship and added cleanup fixes.

12. By Benji York on 2012-02-06

add a docstring to "command" and remove tests that the docstring surplants (and which were fragile)