Merge ~rodsmith/maas-cert-server:new-terminology into maas-cert-server:master

Proposed by Rod Smith
Status: Merged
Approved by: Rod Smith
Approved revision: 3a45bb6d767615f116a49f1574ec1727eda8c900
Merged at revision: faf4be3874d1d30614ddb059bc7e7a92cdd4240e
Proposed branch: ~rodsmith/maas-cert-server:new-terminology
Merge into: maas-cert-server:master
Diff against target: 33 lines (+8/-2)
2 files modified
debian/changelog (+7/-1)
usr/sbin/lxc-setup (+1/-1)
Reviewer Review Type Date Requested Status
Rod Smith Approve
Review via email: mp+407037@code.launchpad.net

Commit message

Review & update terminology (trivial change).

Description of the change

To post a comment you must log in.
Revision history for this message
Rod Smith (rodsmith) wrote :

Trivial change; self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index cfec441..194c14d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,8 +1,14 @@
6+maas-cert-server (0.6.5-0ppa1) focal; urgency=medium
7+
8+ * Review & update terminology; one trivial change
9+
10+ -- Rod Smith <rod.smith@canonical.com> Thu, 12 Aug 2021 14:17:03 -0400
11+
12 maas-cert-server (0.6.4-0ppa1) focal; urgency=medium
13
14 * Add MAAS PPA to LXD container in lxc-setup script.
15
16- -- Rod Smith <rod.smith@canonical.com> Thu, 29 Apr 2021 14:22:59 -0400
17+ -- Rod Smith <rod.smith@canonical.com> Thu, 12 Aug 2021 14:16:37 -0400
18
19 maas-cert-server (0.6.3-0ppa1) focal; urgency=medium
20
21diff --git a/usr/sbin/lxc-setup b/usr/sbin/lxc-setup
22index 55a354b..cbffea5 100755
23--- a/usr/sbin/lxc-setup
24+++ b/usr/sbin/lxc-setup
25@@ -310,7 +310,7 @@ setup_lxd_net() {
26 local octet3=$(echo $host_internal_addr | cut -d "." -f 3)
27 local octet4=$(echo $host_internal_addr | cut -d "." -f 4 | cut -d "/" -f 1)
28 local netmask=$(echo $host_internal_addr | cut -d "." -f 4 | cut -d "/" -f 2)
29- # FIXME: Below will cause an illegal value if the LXD host's IP address is
30+ # FIXME: Below will cause an invalid value if the LXD host's IP address is
31 # the final one of its net. As the user can manually adjust it shortly, we're
32 # letting this slide for the moment....
33 let lxd_octet4=$octet4+1

Subscribers

People subscribed via source and target branches