Merge lp:~frankban/charms/oneiric/buildbot-slave/upgrade-charm into lp:~yellow/charms/oneiric/buildbot-slave/trunk
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | 21 |
Merged at revision: | 20 |
Proposed branch: | lp:~frankban/charms/oneiric/buildbot-slave/upgrade-charm |
Merge into: | lp:~yellow/charms/oneiric/buildbot-slave/trunk |
Diff against target: |
286 lines (+174/-11) 4 files modified
hooks/helpers.py (+42/-10) revision (+0/-1) tests/buildbot-slave.test (+14/-0) tests/test.cfg (+118/-0) |
To merge this branch: | bzr merge lp:~frankban/charms/oneiric/buildbot-slave/upgrade-charm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | code | Approve | |
Review via email: mp+95534@code.launchpad.net |
Description of the change
== Changes ==
- Added upgrade-charm symlink
- Updated helpers (with some refactoring to functions running "juju status")
The file helper.py is in sync with the one present in
lp:~frankban/charms/oneiric/buildbot-master/upgrade-charm
Currently the upgrade-charm test does not work due to a bug of juju:
see https:/
To post a comment you must log in.