Merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-14 into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Proposed by
Francesco Banconi
| Status: | Merged |
|---|---|
| Approved by: | Graham Binns |
| Approved revision: | 32 |
| Merged at revision: | 31 |
| Proposed branch: | lp://staging/~frankban/charms/oneiric/buildbot-master/02-14 |
| Merge into: | lp://staging/~yellow/charms/oneiric/buildbot-master/trunk |
| Diff against target: |
46 lines (+7/-4) 2 files modified
hooks/config-changed (+4/-0) hooks/install (+3/-4) |
| To merge this branch: | bzr merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-14 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
The slaves JSON file can not be initialized in the install hook, because the buildbot user does not exist at that time.
In this new revision the file is removed (if it exists) in the install hook, and correctly initialized in config-changed (as before).
To post a comment you must log in.
Revision history for this message
| Graham Binns (gmb) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
