summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2009-03-06 17:04:49 -0500
committerMichael DeHaan <mdehaan@redhat.com>2009-03-06 17:04:49 -0500
commit61db7baa541acc32b305ea6977a14ee8f5b3f470 (patch)
treeaad6445c02dc5b240b7a584f8fa6a3a4617bb235
parent39cd2b3745c79272938e9c501afd74a315c851ff (diff)
downloadcobbler-61db7baa541acc32b305ea6977a14ee8f5b3f470.tar.gz
cobbler-61db7baa541acc32b305ea6977a14ee8f5b3f470.tar.xz
cobbler-61db7baa541acc32b305ea6977a14ee8f5b3f470.zip
Bump development branch release numbers to 1.7
-rw-r--r--cobbler.spec41
-rw-r--r--setup.py2
2 files changed, 5 insertions, 38 deletions
diff --git a/cobbler.spec b/cobbler.spec
index d494f62c..33033e93 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -3,8 +3,8 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -294,39 +294,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Feb 6 2009 Jeff Schroeder <jeffschroeder@computer.org> - 1.5.0-2
-- Adding build_report.trigger
+* Fri Mar 06 2009 Michael DeHaan <mdehaan@redhat.com> - 1.7.0-1
+- Development release 1.7 start
-* Mon Dec 22 2008 Michael DeHaan <mdehaan@redhat.com> - 1.5.0-1
-- Development release start.
-
-* Mon Dec 22 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
-
-* Fri Dec 19 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
-
-* Wed Dec 10 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
-
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-
-* Tue Nov 18 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
-
-* Fri Nov 14 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Sep 26 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes
diff --git a/setup.py b/setup.py
index 904732fb..d42d787c 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ import cobbler.sub_process as subprocess
import Cheetah.Template as Template
import time
-VERSION = "1.5.0"
+VERSION = "1.7.0"
SHORT_DESC = "Network Boot and Update Server"
LONG_DESC = """
Cobbler is a network install server. Cobbler supports PXE, virtualized installs, and reinstalling existing Linux machines. The last two modes use a helper tool, '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 has a Python and XMLRPC API for integration with other applications. There is also a web interface.