~ahasenack/ubuntu/+source/ubuntu-advantage-tools:disco-v18-update

Branch merges

Propose for merging

Merged into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel at revision 7245b89d3e844a8bf836199330308920dfdc84fe

Christian Ehrhardt  (community): Approve on 2019-01-22

Canonical Server: Pending requested 2019-01-14

Diff: 994 lines (+705/-12)

16 files modified

README.md (+2/-0)
debian/changelog (+13/-0)
keyrings/ubuntu-securitybenchmarks-keyring.gpg (+0/-0)
modules/service-cc.sh (+75/-0)
modules/service-cis.sh (+75/-0)
modules/service-livepatch.sh (+14/-2)
modules/service.sh (+9/-1)
tests/fakes.py (+20/-0)
tests/test_cc.py (+186/-0)
tests/test_cisaudit.py (+187/-0)
tests/test_livepatch_motd.py (+14/-0)
tests/test_script.py (+20/-0)
tests/testing.py (+26/-1)
ubuntu-advantage (+23/-7)
ubuntu-advantage.1 (+35/-1)
update-motd.d/80-livepatch (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

7245b89... by Andreas Hasenack on 2019-01-22

Mention the CIS audit tool in the README.md file

373a2cf... by Andreas Hasenack on 2019-01-22

Remove the word "PPA" from the help output, as it's a needless
implementation detail.

509950e... by Andreas Hasenack on 2019-01-14

changelog

2f822f2... by Andreas Hasenack on 2019-01-11

Revert "Merge pull request #147 from panlinux/switch-kernel-for-lp"

This reverts commit 77606776c83d118264d4bc7efe898b937d28febd, reversing
changes made to df02ea5f24e43cc395df878269895b2ad8d6cb0d.

Dropping the switch-kernel-for-lp merge, as that feature is incomplete and
the way forward is not clear.

245158b... by Andreas Hasenack on 2019-01-11

Use -n when checking if a variable was defined. Solves shellcheck SC2244.

893348b... by Vineetha Kamath on 2018-11-28

Add support for disable-cc-provisioning #151

Signed-off-by: Vineetha Kamath <email address hidden>

22884ef... by Vineetha Kamath on 2018-11-26

Decouple package removal from repository removal for cis audit disable

45548ab... by Vineetha Kamath on 2018-11-16

Fix travis build error by removing whitespace

Signed-off-by: Vineetha Kamath <email address hidden>

030ef6e... by Vineetha Kamath on 2018-11-16

Fix lint errors

Signed-off-by: Vineetha Kamath <email address hidden>

563b095... by Vineetha Kamath on 2018-11-16

Address review comments on PR #155

Added support for disable-cisaudit command and testcases
for it. Updated the cis audit package name and the path
it is installed on the machine.

Signed-off-by: Vineetha Kamath <email address hidden>