1
=== modified file 'templates/img-juju-addin.tmpl'
2
--- templates/img-juju-addin.tmpl	2015-09-24 21:05:42 +0000
3
+++ templates/img-juju-addin.tmpl	2020-06-10 20:59:48 +0000
4
@@ -169,7 +169,7 @@
5
169
echo ""
169
echo ""
6
170
echo "For more information about, see the following links:"
170
echo "For more information about, see the following links:"
7
171
echo "      Juju: https://juju.ubuntu.com/"
171
echo "      Juju: https://juju.ubuntu.com/"
9
172
echo "      Vagrant: htp://www.vagrantbox.es/"
172
echo "      Vagrant: https://www.vagrantbox.es/"
10
173
echo ""
173
echo ""
11
174
echo "Support notice: These images are provided as-is without warranty, support"
174
echo "Support notice: These images are provided as-is without warranty, support"
12
175
echo "      or representation of any fitness whatsoever. These images are"
175
echo "      or representation of any fitness whatsoever. These images are"
13
176
176
14
=== modified file 'templates/img-juju.tmpl'
15
--- templates/img-juju.tmpl	2017-10-10 22:34:03 +0000
16
+++ templates/img-juju.tmpl	2020-06-10 20:59:48 +0000
17
@@ -307,7 +307,7 @@
18
307
echo ""
307
echo ""
19
308
echo "For more information about, see the following links:"
308
echo "For more information about, see the following links:"
20
309
echo "      Juju: https://juju.ubuntu.com/"
309
echo "      Juju: https://juju.ubuntu.com/"
22
310
echo "      Vagrant: htp://www.vagrantbox.es/"
310
echo "      Vagrant: https://www.vagrantbox.es/"
23
311
echo ""
311
echo ""
24
312
echo "Support notice: These images are provided as-is without warranty, support"
312
echo "Support notice: These images are provided as-is without warranty, support"
25
313
echo "      or representation of any fitness whatsoever. These images are"
313
echo "      or representation of any fitness whatsoever. These images are"
Status:	Merged
Merged at revision:	836
Proposed branch:	lp:~brian-murray/vmbuilder/jenkins_kvm
Merge into:	lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target:	25 lines (+2/-2) 2 files modified templates/img-juju-addin.tmpl (+1/-1) templates/img-juju.tmpl (+1/-1)
To merge this branch:	bzr merge lp:~brian-murray/vmbuilder/jenkins_kvm
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Philip Roche		Approve on 2020-06-11
Joshua Powers (community)	2020-06-10	Approve on 2020-06-10
Review via email: mp+385530@code.launchpad.net
1	=== modified file 'templates/img-juju-addin.tmpl'
2	--- templates/img-juju-addin.tmpl 2015-09-24 21:05:42 +0000
3	+++ templates/img-juju-addin.tmpl 2020-06-10 20:59:48 +0000
4	@@ -169,7 +169,7 @@
5	169	echo ""	169	echo ""
6	170	echo "For more information about, see the following links:"	170	echo "For more information about, see the following links:"
7	171	echo " Juju: https://juju.ubuntu.com/"	171	echo " Juju: https://juju.ubuntu.com/"
9	172	echo " Vagrant: htp://www.vagrantbox.es/"	172	echo " Vagrant: https://www.vagrantbox.es/"
10	173	echo ""	173	echo ""
11	174	echo "Support notice: These images are provided as-is without warranty, support"	174	echo "Support notice: These images are provided as-is without warranty, support"
12	175	echo " or representation of any fitness whatsoever. These images are"	175	echo " or representation of any fitness whatsoever. These images are"
13	176		176
14	=== modified file 'templates/img-juju.tmpl'
15	--- templates/img-juju.tmpl 2017-10-10 22:34:03 +0000
16	+++ templates/img-juju.tmpl 2020-06-10 20:59:48 +0000
17	@@ -307,7 +307,7 @@
18	307	echo ""	307	echo ""
19	308	echo "For more information about, see the following links:"	308	echo "For more information about, see the following links:"
20	309	echo " Juju: https://juju.ubuntu.com/"	309	echo " Juju: https://juju.ubuntu.com/"
22	310	echo " Vagrant: htp://www.vagrantbox.es/"	310	echo " Vagrant: https://www.vagrantbox.es/"
23	311	echo ""	311	echo ""
24	312	echo "Support notice: These images are provided as-is without warranty, support"	312	echo "Support notice: These images are provided as-is without warranty, support"
25	313	echo " or representation of any fitness whatsoever. These images are"	313	echo " or representation of any fitness whatsoever. These images are"