diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 13:09:36 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 13:09:36 -0400 |
| commit | 9e0727785a0851ccdff880aa19bb8f21c4aa2840 (patch) | |
| tree | a58c0f76e18b5c87734173fd59bf8b6ca625daa6 /CHANGELOG | |
| parent | f3a7e9f8a2b85fb936d98aa118bec5189b26140f (diff) | |
| parent | a124e7449fbc724637e45457905737883175d15f (diff) | |
| download | third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.gz third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.xz third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.zip | |
Merge branch 'master' into devel
Conflicts:
CHANGELOG
cobbler.spec
cobbler/webui/master.py
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,7 +1,11 @@ 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 @@ -19,7 +23,12 @@ Cobbler CHANGELOG - 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 |