Merge lp://staging/~benji/charms/oneiric/buildbot-slave/small-tweaks into lp://staging/~yellow/charms/oneiric/buildbot-slave/trunk
Proposed by
Benji York
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~benji/charms/oneiric/buildbot-slave/small-tweaks |
| Merge into: | lp://staging/~yellow/charms/oneiric/buildbot-slave/trunk |
| Diff against target: |
61 lines (+12/-7) (has conflicts) 3 files modified
examples/lpbuildbot.yaml (+3/-3) hooks/install (+8/-3) revision (+1/-1) Text conflict in hooks/install |
| To merge this branch: | bzr merge lp://staging/~benji/charms/oneiric/buildbot-slave/small-tweaks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yellow Squad | Pending | ||
|
Review via email:
|
|||
Description of the change
These are some small changes to our Buildbot slave charm:
- tweak the lpbuildbot example config to specify alternate key names
- make the buildbot group creation unconditional
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
