Ubuntu
ntp package

~paelzer/ubuntu/+source/ntp:merge-zesty

  1. Git
  2. lp:~paelzer/ubuntu/+source/ntp
  3. merge-zesty
Last commit made on 2016-12-16
Get this branch:
git clone -b merge-zesty https://git.launchpad.net/~paelzer/ubuntu/+source/ntp
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
merge-zesty
Repository:
lp:~paelzer/ubuntu/+source/ntp

Recent commits

815dbeb... by Christian Ehrhardt 

drop old bug numbers from changelog

Signed-off-by: Christian Ehrhardt <email address hidden>

a8dd179... by Christian Ehrhardt 

Mark release for zesty

Signed-off-by: Christian Ehrhardt <email address hidden>

580c0d2... by Christian Ehrhardt 

mention closing of 427775

Signed-off-by: Christian Ehrhardt <email address hidden>

f67eff5... by Christian Ehrhardt 

update-maintainer

fe49cb5... by Christian Ehrhardt 

reconstruct-changelog

d001471... by Christian Ehrhardt 

Revert d/control: different conflicts/replaces versions on apparmor (was a
dependency on a higher apparmor version, but today all releases are newer)
Note: That change was part of 1f3c0eba5d543bb07d299df727a9364e143d0e40 which
actually should have been split when creating logical in Yakkety cycle
(now it is taken out by this partial revert).

Signed-off-by: Christian Ehrhardt <email address hidden>

6850a9b... by Christian Ehrhardt 

merge-changelogs

924d598... by Christian Ehrhardt 

Fix ntpdate-debian to be able to parse new config of ntp (LP: #1576698)

8c884e7... by Robie Basak

Create etc/apparmor.d/{force-complain,tunables}/

It looks like these were inadvertently dropped.

14:01 <rbasak> tyhicks: I'm reviewing a merge for cpaelzer and the
Ubuntu->Ubuntu diff includes this: http://paste.ubuntu.com/21398245/

14:01 <rbasak> tyhicks: do you know if this is OK please? Does
apparmor/dh-apparmor require the package to drop in these directories?

14:01 <rbasak> I suspect it's fine, but I thought I'd check.

14:05 <jdstrand> I can answer that

14:05 <jdstrand> unless someone changed dh_apparmor very recently
without us knowing, ntp.dirs should not have dropped those entries

14:05 <jdstrand> tyhicks: ^ (I answered rbasak)
(cherry picked from commit 6a24fa2f8caed8c7892b0289a1b1ff1a1aeecdce)

27cfe13... by Christian Ehrhardt 

d/apparmor-profile add samba winbindd pipe (LP: #1582767)

(cherry picked from commit 47dd3b433c7b7a5f3444fccd89b6515da50a0bcf)