diff options
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rw-r--r-- | cobbler.spec | 6 |
2 files changed, 2 insertions, 13 deletions
@@ -1,12 +1,7 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -<<<<<<< HEAD:CHANGELOG - Mon Mar 10 2008 - 0.9.0 -======= -* Tue Apr 08 2008 - 0.8.3 ->>>>>>> master:CHANGELOG -- Make createrepo get run for local cobbler reposync invocations as needed - patch to allow yumopts to override gpgcheck - applied patch to send hostname from ISC - added patch to allow --kopts/--ksmeta items to be cleared with --kopts=delete @@ -19,16 +14,14 @@ Cobbler CHANGELOG - added --clobber option to allow add to overwrite existing objects (for scripts) - ??? - 0.8.3 +- Make createrepo get run for local cobbler reposync invocations as needed - fix WebUI documentation URL - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z - fix default flags for yumdownloader - fix for RHEL 4u6 DVD/tree import x86_64 arch detection -<<<<<<< HEAD:CHANGELOG - fix for dnsmasq template file host config path -======= - fix dnsmasq template to point at the correct hosts file - force all names to be alphanumeric ->>>>>>> master:CHANGELOG * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/cobbler.spec b/cobbler.spec index b4e04bd..9e64040 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,15 +191,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD:cobbler.spec -* Wed Mar 26 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 +* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf -* Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 -======= * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 ->>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 |