juju-deployer

Merge lp:~james-page/juju-deployer/fixup-subs-cli into lp:juju-deployer

  1. fixup-subs-cli
  2. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 110
Proposed branch: lp:~james-page/juju-deployer/fixup-subs-cli
Merge into: lp:juju-deployer
Diff against target: 12 lines (+1/-1)
1 file modified
deployer/env/base.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/juju-deployer/fixup-subs-cli
Reviewer Review Type Date Requested Status
juju-deployers Pending
Review via email: mp+215445@code.launchpad.net

Description of the change

Fixup use of suboridinates from the deployer CLI

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
1=== modified file 'deployer/env/base.py'
2--- deployer/env/base.py 2013-11-12 04:54:58 +0000
3+++ deployer/env/base.py 2014-04-11 15:35:31 +0000
4@@ -85,7 +85,7 @@
5 params.extend(["--config", fh.name])
6 if constraints:
7 params.extend(['--constraints', constraints])
8- if num_units != 1:
9+ if num_units not in [1, None]:
10 params.extend(["--num-units", str(num_units)])
11 if charm_url.startswith('local'):
12 if repo == "":

Subscribers

People subscribed via source and target branches