summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-12-14 17:49:32 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-12-14 17:49:32 -0500
commit8e1b4b1ab5ed6aabbbec2d984f4979474b5ddb90 (patch)
tree9ae1a89f28779864b0c0f71bff4753bfe12e4cf2
parent18c1a0337b325d8ccd725d59456d1dfbb439d057 (diff)
downloadthird_party-cobbler-8e1b4b1ab5ed6aabbbec2d984f4979474b5ddb90.tar.gz
third_party-cobbler-8e1b4b1ab5ed6aabbbec2d984f4979474b5ddb90.tar.xz
third_party-cobbler-8e1b4b1ab5ed6aabbbec2d984f4979474b5ddb90.zip
Release bump since testing release was yesterday
-rw-r--r--CHANGELOG7
-rw-r--r--cobbler.spec7
-rw-r--r--cobbler/webui/master.py8
-rw-r--r--setup.py2
4 files changed, 16 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9d676b0..d6cf6b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,10 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
-* Mon Dec 10 2007 - 0.7.0
+* Fri Dec 15 2007 - 0.7.1
+- ...
+
+* Thu Dec 14 2007 - 0.7.0
- Testing branch
- Fix bug related to <<inherit>> and kickstart args
- Make CLI functions modular and use optparse
@@ -13,6 +16,8 @@ Cobbler CHANGELOG
- New --no-triggers and --no-sync on "adds" for performance and other reasons
- pxe_just_once is now much faster.
- performance testing scripts (in source checkout)
+- webui now uses Apache logging
+- misc webui fixes
- ...
* Wed Nov 14 2007 - 0.6.4
diff --git a/cobbler.spec b/cobbler.spec
index c90dcf0..7a3ab25 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
@@ -189,7 +189,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Dec 10 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
+* Fri Dec 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Dec 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
- Upstream changes (see CHANGELOG), testing branch
- Don't require syslinux
- Added requires on rsync
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index fcf236b..f0c1028 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -31,10 +31,10 @@ VFFSL=valueFromFrameOrSearchList
VFSL=valueFromSearchList
VFN=valueForName
currentTime=time.time
-__CHEETAH_version__ = '2.0'
-__CHEETAH_versionTuple__ = (2, 0, 0, 'final', 0)
-__CHEETAH_genTime__ = 1196955444.403892
-__CHEETAH_genTimestamp__ = 'Thu Dec 6 10:37:24 2007'
+__CHEETAH_version__ = '2.0.1'
+__CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0)
+__CHEETAH_genTime__ = 1197586818.889889
+__CHEETAH_genTimestamp__ = 'Thu Dec 13 18:00:18 2007'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Tue Dec 4 17:33:59 2007'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
diff --git a/setup.py b/setup.py
index 75b06f0..eb2a23d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
from distutils.core import setup, Extension
import string
-VERSION = "0.7.0"
+VERSION = "0.7.1"
SHORT_DESC = "Network Boot and Update Server"
LONG_DESC = """
Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP Management. Cobbler has a Python API for integration with other GPL systems management applications.