summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-05-28 16:23:05 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-05-28 16:23:05 -0400
commita455f411b5e88ccacfcf8870b5b6173fd71dbe63 (patch)
treeaf52412273d2c6b81a0183f77cd2affa8895f394
parent3fe142277bb45e1b568081d73bec19a794833ba1 (diff)
downloadthird_party-cobbler-a455f411b5e88ccacfcf8870b5b6173fd71dbe63.zip
third_party-cobbler-a455f411b5e88ccacfcf8870b5b6173fd71dbe63.tar.gz
third_party-cobbler-a455f411b5e88ccacfcf8870b5b6173fd71dbe63.tar.xz
Fix devel branch versions
-rw-r--r--cobbler.spec2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cobbler.spec b/cobbler.spec
index a738f40..111072d 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -188,7 +188,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-- Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.1.0-1
+* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.1.0-1
- Upstream chnages (see CHANGELOG)
* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-2
diff --git a/setup.py b/setup.py
index 4b08917..b314cb2 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
from distutils.core import setup, Extension
import string
-VERSION = "1.0.0"
+VERSION = "1.1.0"
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/DNS Management. Cobbler also has a Python and XMLRPC API for integration with other applications.