Merge lp://staging/~james-page/charms/oneiric/jenkins/trunk into lp://staging/charms/oneiric/jenkins
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merge reported by: | James Page |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~james-page/charms/oneiric/jenkins/trunk |
| Merge into: | lp://staging/charms/oneiric/jenkins |
| Diff against target: |
359 lines (+168/-41) 17 files modified
CHANGES.md (+10/-0) TODO.md (+1/-10) config.yaml (+19/-1) hooks/addnode (+3/-1) hooks/config-changed (+7/-0) hooks/delnode (+3/-1) hooks/install (+77/-15) hooks/master-relation-broken (+1/-1) hooks/master-relation-changed (+1/-1) hooks/master-relation-departed (+1/-1) hooks/start (+1/-1) hooks/stop (+1/-1) hooks/upgrade-charm (+7/-0) hooks/upgrade-formula (+0/-7) metadata.yaml (+1/-1) templates/jenkins-config.xml (+10/-0) templates/user-config.xml (+25/-0) |
| To merge this branch: | bzr merge lp://staging/~james-page/charms/oneiric/jenkins/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Clint Byrum (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
More configuration options include:
username and password to use during adminstration - used to add and remove slave entries and as bootstrap entry to jenkins master.
Use of LTS and trunk upstream distributions from Jenkins - still defaults to 'distro' but provides more options for users if they want them.
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
Another James Page mastercraft. +1, merge away!