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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 518
Merged at revision: 518
Proposed branch: lp:~andreserl/maas/ntp
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 31 lines (+3/-0)
2 files modified
debian/changelog (+1/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~andreserl/maas/ntp
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+304620@code.launchpad.net

Commit message

Add depends on ntp

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-08-31 19:26:51 +0000
+++ debian/changelog 2016-09-01 11:05:57 +0000
@@ -1,6 +1,7 @@
1maas (2.1.0~alpha2+bzr5307-0ubuntu1) UNRELEASED; urgency=medium1maas (2.1.0~alpha2+bzr5307-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
4 * Add depends on ntp
45
5 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 31 Aug 2016 20:25:17 +01006 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 31 Aug 2016 20:25:17 +0100
67
78
=== modified file 'debian/control'
--- debian/control 2016-08-25 23:49:43 +0000
+++ debian/control 2016-09-01 11:05:57 +0000
@@ -74,6 +74,7 @@
74 maas-cli (=${binary:Version}),74 maas-cli (=${binary:Version}),
75 maas-common (= ${binary:Version}),75 maas-common (= ${binary:Version}),
76 maas-proxy (= ${binary:Version}),76 maas-proxy (= ${binary:Version}),
77 ntp,
77 python3-bson,78 python3-bson,
78 python3-django,79 python3-django,
79 python3-django-maas (= ${binary:Version}),80 python3-django-maas (= ${binary:Version}),
@@ -190,6 +191,7 @@
190 maas-cli (=${binary:Version}),191 maas-cli (=${binary:Version}),
191 maas-common (=${binary:Version}),192 maas-common (=${binary:Version}),
192 maas-dhcp (=${binary:Version}),193 maas-dhcp (=${binary:Version}),
194 ntp,
193 pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),195 pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),
194 python3-httplib2,196 python3-httplib2,
195 python3-maas-provisioningserver (=${binary:Version}),197 python3-maas-provisioningserver (=${binary:Version}),

Subscribers

People subscribed via source and target branches

to all changes: