summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler.spec3
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d43d434..dea6f87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
+- Wed May 27 2008 - 1.0.0
+- Merge devel branch onto master, this is 1.0
+
- Mon May 12 2008 - 0.9.2
- run createrepo with less preconditions during cobbler reposync
- doc upgrades and error handling for "cobbler replicate"
diff --git a/cobbler.spec b/cobbler.spec
index c2a1375..37dce30 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -189,6 +189,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-1
+- Upstream changes (see CHANGELOG)
+
* Fri May 16 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.2-2
- Upstream changes (see CHANGELOG)
- moved /var/lib/cobbler/settings to /etc/cobbler/settings