diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-29 12:13:02 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-29 12:13:02 -0400 |
| commit | c229ab1045d0d0668984d09026c6de74ec74eb33 (patch) | |
| tree | 37c93be056ef1b57189a73cab21327d54c782cad /CHANGELOG | |
| parent | 70aafe12b4e05038bd52c38c33368b8d9ce48ea4 (diff) | |
| parent | 59ecc2ebecdf10d46db2b8606b25a16c46c74e64 (diff) | |
| download | third_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.tar.gz third_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.tar.xz third_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.zip | |
Merge branch 'master' into devel
Conflicts:
CHANGELOG
cobbler.spec
setup.py
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -4,6 +4,10 @@ Cobbler CHANGELOG - Wed May 27 2008 - 1.1.0 - start devel branch +- Thr May 28 2008 - 1.0.1 +- Fix misformatted warning in "check" +- Do not own tftpboot + - Wed May 27 2008 - 1.0.0 - Merge devel branch onto master, this is 1.0 |