MAAS

Merge lp:~cjohnston/maas/1481118-apikey-doc-fix into lp:maas/1.7

  1. 1481118-apikey-doc-fix
  2. Merge into 1.7
Proposed by Chris Johnston
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 3381
Proposed branch: lp:~cjohnston/maas/1481118-apikey-doc-fix
Merge into: lp:maas/1.7
Diff against target: 11 lines (+1/-1)
1 file modified
docs/maascli.rst (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/maas/1481118-apikey-doc-fix
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+266817@code.launchpad.net

Commit message

Backport r4154 from trunk - Add --username to maas-region-admin apikey command docs.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Let's land this on trunk first (lp:maas) and then "backport" (even though I hate to use that word for such a trivial change) to 1.7 and 1.8.

I'll approve this version after trunk and 1.8 branches land.

Sorry to be pedantic on this, but it would be easy to lose this fix long-term if we don't insist on the proper ordering.

review: Needs Fixing
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Approving now that trunk and 1.8 branches have landed (or are landing).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/maascli.rst'
2--- docs/maascli.rst 2014-09-23 19:54:04 +0000
3+++ docs/maascli.rst 2015-08-04 00:30:40 +0000
4@@ -40,7 +40,7 @@
5 To obtain the key through the command line, run this command on the region
6 controller (it requires root access)::
7
8- $ sudo maas-region-admin apikey my-username
9+ $ sudo maas-region-admin apikey --username=my-username
10
11 (Substitute your MAAS user name for my-username).
12

Subscribers

People subscribed via source and target branches

to all changes: