Merge lp://staging/~andreserl/maas/lp1604169_2.0 into lp://staging/maas/2.0

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5167
Proposed branch: lp://staging/~andreserl/maas/lp1604169_2.0
Merge into: lp://staging/maas/2.0
Diff against target: 91 lines (+35/-10)
3 files modified
docs/changelog.rst (+2/-0)
src/maascli/cli.py (+7/-1)
src/maascli/tests/test_cli.py (+26/-9)
To merge this branch: bzr merge lp://staging/~andreserl/maas/lp1604169_2.0
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+300607@code.staging.launchpad.net

Commit message

Backport rev5189 from trunk :Ensure maasserver is available before allowing maas cli to run with extra commands, otherwise don't show maasserver related commands

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

self approve! Fix landed in trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches