Merge lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install into lp://staging/~canonical-ci-engineering/charms/trusty/jenkins/ubiquity
Proposed by
Paul Larson
Status: | Merged |
---|---|
Merged at revision: | 49 |
Proposed branch: | lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install |
Merge into: | lp://staging/~canonical-ci-engineering/charms/trusty/jenkins/ubiquity |
Diff against target: |
118 lines (+22/-24) 4 files modified
README.ubiquity-testing (+6/-0) config.yaml (+1/-5) deploy.yaml (+1/-5) hooks/install (+14/-14) |
To merge this branch: | bzr merge lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joe Talbott (community) | Approve | ||
Paul Larson | Needs Resubmitting | ||
Review via email: mp+250760@code.staging.launchpad.net |
Description of the change
Bring back Joseph's much better idea of allowing installation of jenkins from a files dir, and also add in plugin installation from there.
To post a comment you must log in.
One minor thing in-line.