summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler.spec7
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dea6f87..e506f05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
+- Wed May 27 2008 - 1.1.0
+- start devel branch
+
- Wed May 27 2008 - 1.0.0
- Merge devel branch onto master, this is 1.0
diff --git a/cobbler.spec b/cobbler.spec
index cccaa63..a738f40 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,8 +2,8 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 1.0.0
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -188,6 +188,9 @@ 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
+- Upstream chnages (see CHANGELOG)
+
* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-2
- Upstream changes (see CHANGELOG)