summaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-12-22 14:29:37 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-12-22 14:29:37 -0500
commit65703689fc6a509e07ed6f8ba267dcdf7e18be45 (patch)
tree80c97de6809f9fd905b0d1fd52f5efb01a422834 /CHANGELOG
parent94200df597f9954e64ff30db57da94b4c6653841 (diff)
parent6e73337ad583f7dc52fad37aa8fcfe45abbf0842 (diff)
downloadcobbler-65703689fc6a509e07ed6f8ba267dcdf7e18be45.tar.gz
cobbler-65703689fc6a509e07ed6f8ba267dcdf7e18be45.tar.xz
cobbler-65703689fc6a509e07ed6f8ba267dcdf7e18be45.zip
Merge branch 'master' into devel
Conflicts: CHANGELOG cobbler.spec setup.py
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG5
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 781013b7..af301c6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,9 +3,12 @@ Cobbler CHANGELOG
- Mon Dec 22 2008 - 1.5.X
- (FEAT) Batch editing of system objects -- power, profile, netboot, etc
+- Mon Dec 19 2008 - 1.4.1
+- (BUGF) Cobbler check looks for right httpd on SUSE
+- (BUGF) post_install_network_config snippet had bash errors
+
- Fri Dec 19 2008 - 1.4
- (----) Stable release of 1.3 development branch
-- (BUGF) Cobbler check looks for right httpd on SUSE
- Fri Dec 19 2008 - 1.3
- (FEAT) ACLs to extend authz (see Wiki)