[nsd/f16: 13/13] Merge branch 'master' into f16
Paul Wouters
pwouters at fedoraproject.org
Tue Jul 17 01:21:29 UTC 2012
commit 85c5dd14e2f9f2bb5a6b013b94215f541a430ccc
Merge: 592aac8 0e31a2d
Author: Paul Wouters <pwouters at redhat.com>
Date: Mon Jul 16 21:20:26 2012 -0400
Merge branch 'master' into f16
Conflicts:
nsd.spec
.gitignore | 2 ++
nsd.init | 7 ++-----
nsd.spec | 13 +++++++++----
sources | 2 +-
4 files changed, 14 insertions(+), 10 deletions(-)
---
diff --cc nsd.spec
index 95538db,35f6f87..4945913
--- a/nsd.spec
+++ b/nsd.spec
@@@ -118,6 -119,20 +119,10 @@@ f
%changelog
+ * Mon Jul 16 2012 Paul Wouters <pwouters at redhat.com> - 3.2.11-1
+ - Updated to 3.2.11
+ - Remove execute perm from unitdir file
+
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Nov 29 2011 Paul Wouters <paul at xelerance.com> - 3.2.9-2
-- Change spec and initscript to chown /var/run/nsd to nsd user to work around
- the "nsdc restart" problem where it cannot update its own pid file
-
-* Sun Nov 27 2011 Paul Wouters <paul at xelerance.com> - 3.2.9-1
-- Updated to 3.2.9
-
* Mon Sep 12 2011 Tom Callaway <spot at fedoraproject.org> - 3.2.8-7
- fix tmpfiles.d creation of /var/run/nsd to be owned by root
More information about the scm-commits
mailing list