MAAS

Merge lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging

  1. packaging
  2. Merge into packaging
Proposed by Julian Edwards on 2012-08-31
Status: Merged
Approved by: Julian Edwards on 2012-08-31
Approved revision: no longer in the source branch.
Merged at revision: 73
Proposed branch: lp:~julian-edwards/maas/packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/patches/02-pserv-config.patch (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve on 2012-08-31
Review via email: mp+122181@code.launchpad.net

Commit Message

* New upstream release
* Fix 02-pserv-config.patch to handle new default tftp directory

Description of the Change

  * New upstream release
  * Fix 02-pserv-config.patch to handle new default tftp directory

To post a comment you must log in.
Julian Edwards (julian-edwards) :
review: Approve
lp:~julian-edwards/maas/packaging updated on 2012-08-31
73. By Julian Edwards on 2012-08-31

[r=julian-edwards][bug=][author=julian-edwards] * New upstream release
* Fix 02-pserv-config.patch to handle new default tftp directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-29 04:00:40 +0000
3+++ debian/changelog 2012-08-31 01:46:17 +0000
4@@ -1,3 +1,10 @@
5+maas (0.1+bzr950+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release
8+ * Fix 02-pserv-config.patch to handle new default tftp directory
9+
10+ -- Julian Edwards <julian.edwards@canonical.com> Fri, 31 Aug 2012 11:41:21 +1000
11+
12 maas (0.1+bzr941+dfsg-0ubuntu1) UNRELEASED; urgency=low
13
14 * New upstream release
15
16=== modified file 'debian/patches/02-pserv-config.patch'
17--- debian/patches/02-pserv-config.patch 2012-08-23 21:32:31 +0000
18+++ debian/patches/02-pserv-config.patch 2012-08-31 01:46:17 +0000
19@@ -27,7 +27,7 @@
20
21 @@ -33,10 +33,8 @@
22 tftp:
23- # root: /var/lib/tftpboot
24+ # root: /var/lib/maas/tftp
25 # port: 69
26 - port: 5244
27 ## The URL to be contacted to generate PXE configurations.

Subscribers

People subscribed via source and target branches