Merge lp://qastaging/~frankban/juju-quickstart/minor-typos into lp://qastaging/juju-quickstart
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 93 |
Proposed branch: | lp://qastaging/~frankban/juju-quickstart/minor-typos |
Merge into: | lp://qastaging/juju-quickstart |
Diff against target: |
64 lines (+13/-15) 3 files modified
quickstart/app.py (+2/-4) quickstart/manage.py (+4/-4) quickstart/models/envs.py (+7/-7) |
To merge this branch: | bzr merge lp://qastaging/~frankban/juju-quickstart/minor-typos |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+231771@code.qastaging.launchpad.net |
Description of the change
Minor fixes in preparation for release.
To post a comment you must log in.
Reviewers: mp+231771_ code.launchpad. net,
Message:
Please take a look.
Description:
Minor fixes in preparation for release.
https:/ /code.launchpad .net/~frankban/ juju-quickstart /minor- typos/+ merge/231771
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/125640043/
Affected files (+15, -15 lines): manage. py models/ envs.py
A [revision details]
M quickstart/app.py
M quickstart/
M quickstart/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>
Index: quickstart/app.py
cmd. append( '--upload- tools') '--upload- series' ) upload_ series) ['--upload- series' , upload_series]) '--constraints' ) constraints) ['--constraints ', constraints])
=== modified file 'quickstart/app.py'
--- quickstart/app.py 2014-08-01 15:35:56 +0000
+++ quickstart/app.py 2014-08-21 16:24:05 +0000
@@ -192,11 +192,9 @@
if upload_tools:
if upload_series is not None:
- cmd.append(
- cmd.append(
+ cmd.extend(
if constraints is not None:
- cmd.append(
- cmd.append(
+ cmd.extend(
retcode, _, error = utils.call(*cmd)
if retcode:
# XXX frankban 2013-11-13 bug 1252322: the check below is weak. We
are
Index: quickstart/ manage. py manage. py' manage. py 2014-08-21 13:36:32 +0000 manage. py 2014-08-21 16:23:26 +0000
help= 'upload tools for supplied comma-separated series list') add_argument(
'--constrain ts',
'environment for all future machines, exactly as if the\n' .\n') ".\n')
=== modified file 'quickstart/
--- quickstart/
+++ quickstart/
@@ -463,11 +463,11 @@
parser.
- help='If constraints are specified in the bootstrap command,\n'
- 'they will apply to the machine provisioned for the juju
state\n'
- 'server. They will also be set as default constraints on
the\n'
+ help='If constraints are specified, they will apply to the
machine\n'
+ 'provisioned for the Juju state server. \n'
+ 'They will also be set as default constraints on the\n'
- 'constraints were set with juju set-constraints
+ 'constraints were set with "juju set-constraints
# Parse the provided arguments.
options = parser.parse_args()
Index: quickstart/ models/ envs.py models/ envs.py' models/ envs.py 2014-08-21 13:40:09 +0000 models/ envs.py 2014-08-21 16:23:26 +0000
default= 'lxcbr0' , help='the LXC bridge interface to use'),
fields. BoolField(
'lxc- clone', label='use lxc-clone', required=False,
=== modified file 'quickstart/
--- quickstart/
+++ quickstart/
@@ -685,15 +685,15 @@
- help='use lxc-clone to create the containers '
- 'used as machines. LXC clone is enabled by default for
Trusty '
- 'and above, and disabled for earlier Ubuntu releases.'),
+ help='Us...