diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-01-26 18:11:40 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-01-26 18:11:40 -0500 |
| commit | 79450dfb50026bebf40e8816a9d97a787ba2c86e (patch) | |
| tree | 44d26719f54048e0831b8f8fc752d8f1299eebce /CHANGELOG | |
| parent | f3ef0c85b95e0681175927841c4a07b5dec724a6 (diff) | |
| download | cobbler-79450dfb50026bebf40e8816a9d97a787ba2c86e.tar.gz cobbler-79450dfb50026bebf40e8816a9d97a787ba2c86e.tar.xz cobbler-79450dfb50026bebf40e8816a9d97a787ba2c86e.zip | |
Fix image type editing in the webapp
Conflicts:
CHANGELOG
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -13,7 +13,11 @@ Cobbler CHANGELOG - (BUGF) fix typo in network template (DNS enumeration) - (BUGF) make buildiso work for systems that are using bonding - (BUGF) blending fix for --template-files +<<<<<<< HEAD:CHANGELOG - (BUGF) cobbler check ignores comments in TFTP config +======= +- (BUGF) fix image type field editing in the webapp +>>>>>>> a1b9274... Fix image type editing in the webapp:CHANGELOG - Fri Jan 09 2009 - 1.4.1 - (BUGF) Cobbler check looks for right httpd on SUSE |