diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 15:09:12 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 15:09:12 -0400 |
| commit | eee1f27f6ac05a8873fd63eeb10599a255949cb7 (patch) | |
| tree | a06cd45276ed3eb7e45549272cebf8c538e568ab /cobbler.spec | |
| parent | cdca9443cab19f992e76a205533be0d13c091d47 (diff) | |
| parent | b5fdeb836a9340f996b8c9c1b61704052c4e5d8a (diff) | |
| download | third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.tar.gz third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.tar.xz third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.zip | |
Merge branch 'master' into devel
Conflicts:
cobbler.spec
cobbler/webui/master.py
Diffstat (limited to 'cobbler.spec')
| -rw-r--r-- | cobbler.spec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cobbler.spec b/cobbler.spec index 9e64040..070bff3 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,11 +191,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +<<<<<<< HEAD:cobbler.spec * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +======= +* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2 +>>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 |