Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/sshuttle-take2 into lp:uci-engine

  1. sshuttle-take2
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 580
Merged at revision: 580
Proposed branch: lp:~cjohnston/uci-engine/sshuttle-take2
Merge into: lp:uci-engine
Diff against target: 13 lines (+2/-1)
1 file modified
juju-deployer/deploy.py (+2/-1)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/sshuttle-take2
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+223108@code.launchpad.net

Commit message

Fix minor oversite from sshuttle workaround

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/deploy.py'
2--- juju-deployer/deploy.py 2014-06-12 15:54:58 +0000
3+++ juju-deployer/deploy.py 2014-06-13 17:59:22 +0000
4@@ -173,7 +173,8 @@
5 information."""
6
7 juju_env = _get_juju_env()
8- return envs['environments'][juju_env]['control-bucket']
9+ juju_yaml = _get_environments_yaml()
10+ return juju_yaml['environments'][juju_env]['control-bucket']
11
12
13 def _delete_control_bucket():

Subscribers

People subscribed via source and target branches