summaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 54bfac6..3f8cf5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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