Merge lp://staging/~benji/charms/oneiric/buildbot-master/remove-base64 into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Proposed by
Benji York
| Status: | Merged |
|---|---|
| Approved by: | Brad Crittenden |
| Approved revision: | 26 |
| Merged at revision: | 26 |
| Proposed branch: | lp://staging/~benji/charms/oneiric/buildbot-master/remove-base64 |
| Merge into: | lp://staging/~yellow/charms/oneiric/buildbot-master/trunk |
| Diff against target: |
320 lines (+123/-104) 6 files modified
README.txt (+0/-11) config.yaml (+2/-5) examples/pyflakes.yaml (+117/-74) hooks/config-changed (+2/-3) hooks/helpers.py (+1/-9) tests/buildbot-master.test (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~benji/charms/oneiric/buildbot-master/remove-base64 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brad Crittenden (community) | code | Approve | |
|
Review via email:
|
|||
Description of the change
This branch removes the need to base64 encode the Buildbot config file.
(and it increases the timeout on wait_for_unit so slow unit-creation on EC2 won't bite us so hard)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
a-ok