Merge lp://qastaging/~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined into lp://qastaging/charms/jenkins-slave
Proposed by
Timothy R. Chavez
| Status: | Merged |
|---|---|
| Merged at revision: | 12 |
| Proposed branch: | lp://qastaging/~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined |
| Merge into: | lp://qastaging/charms/jenkins-slave |
| Diff against target: |
15 lines (+2/-1) 2 files modified
hooks/slave-relation-joined (+1/-0) revision (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-slave-relation-joined |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Set 'slaveaddress' in the 'slave-
Jenkins master requires (assumes, even) that it is. If 'slaveaddress'
is not set by the slave when a relation is added between the Jenkins
master and Jenkins slave, the Jenkins master will instead pass an empty
string to the 'addnode' helper script, causing breakage, and resulting in
a 'master-
relation.
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
LGTM +1