Merge branch 'master' into f13

2010-10-27 12:23:01 -04:00 · 2010-10-27 12:23:01 -04:00 · 8b7ead5417
commit 8b7ead5417
parent 20442332be 1fad469d23
3 changed files with 12 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-chkconfig-1.3.45.tar.bz2
+/chkconfig-1.3.48.tar.bz2
--- a/chkconfig.spec
+++ b/chkconfig.spec
@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.45
+Version: 1.3.48
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@ -74,6 +74,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/ntsysv.8*

 %changelog
+* Wed Oct 27 2010 Bill Nottingham <notting@redhat.com> 1.3.48-1
+- fix install_initd invocation for services that require $local_fs (#632294)
+
+* Tue Aug 10 2010 Bill Nottingham <notting@redhat.com> 1.3.47-1
+- Fix regression introduced in 1.3.45 (#622799)
+
+* Wed May 05 2010 Bill Nottingham <notting@redhat.com> 1.3.46-1
+- translation updates: hu, kn, ko (#589187)
+
 * Thu Mar 04 2010 Bill Nottingham <notting@redhat.com> 1.3.45-1
 - add support for Should-Start, Should-Stop (#98470, <iarnell@gmail.com>)
 - ntsysv: don't drop initscripts with '.' in the name (#556751)
--- a/2
+++ b/2
@ -1 +1 @@
-6a12bbbbc5e95217afbf221cecf16c40  chkconfig-1.3.45.tar.bz2
+3afd02587146f497463a66840bdf181d  chkconfig-1.3.48.tar.bz2