Merge ~tagatac/cloud-init:docs into cloud-init:master

Proposed by David Tagatac
Status: Merged
Approved by: Scott Moser
Approved revision: b827cc78d93b1562013571da52c0a21bcd435a37
Merged at revision: b704110f371cc0654ff4c4a674d329e7c0cb7861
Proposed branch: ~tagatac/cloud-init:docs
Merge into: cloud-init:master
Diff against target: 16 lines (+3/-3)
1 file modified
doc/rtd/topics/capabilities.rst (+3/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
cloud-init Commiters Pending
Review via email: mp+321481@code.launchpad.net

Commit message

doc: correct grammar in capabilities.rst

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:b827cc78d93b1562013571da52c0a21bcd435a37
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tagatac/cloud-init/+git/cloud-init/+merge/321481/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/188/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/188
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/188
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/188
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/188
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/188

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/188/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/rtd/topics/capabilities.rst b/doc/rtd/topics/capabilities.rst
2index 4a41108..2c8770b 100644
3--- a/doc/rtd/topics/capabilities.rst
4+++ b/doc/rtd/topics/capabilities.rst
5@@ -3,9 +3,9 @@ Capabilities
6 ************
7
8 - Setting a default locale
9-- Setting a instance hostname
10-- Generating instance ssh private keys
11-- Adding ssh keys to a users ``.ssh/authorized_keys`` so they can log in
12+- Setting an instance hostname
13+- Generating instance SSH private keys
14+- Adding SSH keys to a user's ``.ssh/authorized_keys`` so they can log in
15 - Setting up ephemeral mount points
16 - Configuring network devices
17

Subscribers

People subscribed via source and target branches