Merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/restish-fix-master into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/restish

Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~fginther/charms/precise/ubuntu-ci-services-itself/restish-fix-master
Merge into: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/restish
Diff against target: 12 lines (+2/-0)
1 file modified
hooks/hooks.py (+2/-0)
To merge this branch: bzr merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/restish-fix-master
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+200937@code.launchpad.net

Commit message

Add jenkins master job and token as config items.

Description of the change

Add jenkins master job and token as config items.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2013-12-20 15:28:05 +0000
3+++ hooks/hooks.py 2014-01-08 23:16:43 +0000
4@@ -176,6 +176,8 @@
5 "lander_password": _relation_get('password'),
6 "lander_hostname": _relation_get('hostname'),
7 "lander_port": _relation_get('port'),
8+ "lander_master_job": _relation_get('master_job'),
9+ "lander_job_token": _relation_get('job_token'),
10 }
11 with open(os.path.join(_service_dir(config), 'lander_config.json'),
12 'w') as f:

Subscribers

People subscribed via source and target branches