MAAS

Merge lp:~andreserl/maas/packaging_fix_pserv into lp:~maas-maintainers/maas/packaging

  1. packaging_fix_pserv
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 387
Merged at revision: 387
Proposed branch: lp:~andreserl/maas/packaging_fix_pserv
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 38 lines (+7/-8)
2 files modified
debian/changelog (+2/-2)
debian/patches/02-pserv-config.patch (+5/-6)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_fix_pserv
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+257719@code.launchpad.net

Commit message

debian/patches/02-pserv-config.patch: Fix config file (LP: #1449862)

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good.

review: Approve

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 2015-04-24 22:56:18 +0000
3+++ debian/changelog 2015-04-29 06:49:10 +0000
4@@ -1,6 +1,6 @@
5-maas (1.8.0~beta5+bzr3844-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.8.0~beta5+bzr3849-0ubuntu1) UNRELEASED; urgency=medium
7
8- * UNRELEASED
9+ * d/p/02-pserv.yaml: Fix config file (LP: #1449862)
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 24 Apr 2015 18:55:47 -0400
12
13
14=== modified file 'debian/patches/02-pserv-config.patch'
15--- debian/patches/02-pserv-config.patch 2015-02-18 04:09:08 +0000
16+++ debian/patches/02-pserv-config.patch 2015-04-29 06:49:10 +0000
17@@ -4,16 +4,15 @@
18 Author: Andres Rodriguez <andreserl@ubuntu.com>
19
20 === modified file 'etc/maas/pserv.yaml'
21-Index: maas-1.8.0~alpha1+bzr3523.orig/etc/maas/pserv.yaml
22+Index: maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml
23 ===================================================================
24---- maas-1.8.0~alpha1+bzr3523.orig.orig/etc/maas/pserv.yaml 2015-02-17 22:25:42.304015180 -0500
25-+++ maas-1.8.0~alpha1+bzr3523.orig/etc/maas/pserv.yaml 2015-02-17 22:25:42.300015180 -0500
26-@@ -18,8 +18,6 @@
27+--- maas-1.8.0~beta5+bzr3849.orig.orig/etc/maas/pserv.yaml 2015-04-29 02:40:55.703960406 -0400
28++++ maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml 2015-04-29 02:41:10.567959953 -0400
29+@@ -18,7 +18,6 @@
30 # resource_root: /var/lib/maas/boot-resources/current/
31
32 # port: 69
33 - port: 5244
34 ## The URL to be contacted to generate PXE configurations.
35 # generator: http://localhost/MAAS/api/1.0/pxeconfig/
36-- generator: http://localhost:5240/api/1.0/pxeconfig/
37-
38+ generator: http://localhost:5240/MAAS/api/1.0/pxeconfig/

Subscribers

People subscribed via source and target branches

to all changes: