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

[Francis Ginther]

Add jenkins master job and token as config items.

Add jenkins master job and token as config items.

[Andy Doan (doanac)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-12-20 15:28:05 +0000
+++ hooks/hooks.py	2014-01-08 23:16:43 +0000
@@ -176,6 +176,8 @@
         "lander_password": _relation_get('password'),
         "lander_hostname": _relation_get('hostname'),
         "lander_port": _relation_get('port'),
+        "lander_master_job": _relation_get('master_job'),
+        "lander_job_token": _relation_get('job_token'),
     }
     with open(os.path.join(_service_dir(config), 'lander_config.json'),
               'w') as f: