juju-core

Merge lp:~adeuring/juju-core/1251095 into lp:~go-bot/juju-core/trunk

  1. 1251095
  2. Merge into trunk
Proposed by Abel Deuring
Status: Merged
Approved by: Abel Deuring
Approved revision: no longer in the source branch.
Merged at revision: 2078
Proposed branch: lp:~adeuring/juju-core/1251095
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
cmd/juju/constraints.go (+2/-2)
To merge this branch: bzr merge lp:~adeuring/juju-core/1251095
Reviewer Review Type Date Requested Status
Abel Deuring (community) Approve
Review via email: mp+195780@code.launchpad.net

Commit message

fix the example in "juju set-constraints -h"

Description of the change

fix the example in "juju set-constraints -h"

See LP bug 1251095: set-constrains example gives "error: malformed constraint"

The example shown for "juju set-constraints -h" was wrong; the fix is obvious.

https://codereview.appspot.com/29000043/

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) wrote :

Reviewers: mp+195780_code.launchpad.net,

Message:
Please take a look.

Description:
fix the example in "juju set-constraints -h"

See LP bug 1251095: set-constrains example gives "error: malformed
constraint"

The example shown for "juju set-constraints -h" was wrong; the fix is
obvious.

https://code.launchpad.net/~adeuring/juju-core/1251095/+merge/195780

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/29000043/

Affected files (+4, -2 lines):
   A [revision details]
   M cmd/juju/constraints.go

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: tarmac-20131119103655-3r9zk5y8rhzy33l3
+New revision: <email address hidden>

Index: cmd/juju/constraints.go
=== modified file 'cmd/juju/constraints.go'
--- cmd/juju/constraints.go 2013-11-05 00:55:25 +0000
+++ cmd/juju/constraints.go 2013-11-19 12:36:03 +0000
@@ -37,8 +37,8 @@

  Examples:

- set-constraints mem=8G (all new machines in the
environment must have at least 8GB of RAM)
- set-constraints wordpress mem=4G (all new wordpress machines can
ignore the 8G constraint above, and require only 4G)
+ set-constraints mem=8G (all new machines in the
environment must have at least 8GB of RAM)
+ set-constraints --service wordpress mem=4G (all new wordpress
machines can ignore the 8G constraint above, and require only 4G)

  See Also:
     juju help constraints

Revision history for this message
Roger Peppe (rogpeppe) wrote :

On 2013/11/19 13:51:23, abel.deuring wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/29000043/

Revision history for this message
Frank Mueller (themue) wrote :

LGTM

https://codereview.appspot.com/29000043/

Revision history for this message
Abel Deuring (adeuring) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/juju/constraints.go'
2--- cmd/juju/constraints.go 2013-11-05 00:55:25 +0000
3+++ cmd/juju/constraints.go 2013-11-19 13:54:37 +0000
4@@ -37,8 +37,8 @@
5
6 Examples:
7
8- set-constraints mem=8G (all new machines in the environment must have at least 8GB of RAM)
9- set-constraints wordpress mem=4G (all new wordpress machines can ignore the 8G constraint above, and require only 4G)
10+ set-constraints mem=8G (all new machines in the environment must have at least 8GB of RAM)
11+ set-constraints --service wordpress mem=4G (all new wordpress machines can ignore the 8G constraint above, and require only 4G)
12
13 See Also:
14 juju help constraints

Subscribers

People subscribed via source and target branches

to status/vote changes: