summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonyg@lshift.net>2009-10-19 23:53:02 +0100
committerTony Garnock-Jones <tonyg@lshift.net>2009-10-19 23:53:02 +0100
commit343e2827a0f04d6c5c71a7ae591b17d5066c3506 (patch)
tree61e8fb2846de469e50fc44e1728021087c8e559a
parentb14c1e9bca13e34beb216c4c04f8fb0cf9ec1497 (diff)
parent0aca55dbe898a61a2379cff6b151822de2dd3834 (diff)
downloadrabbitmq-server-git-343e2827a0f04d6c5c71a7ae591b17d5066c3506.tar.gz
Merge default into amqp_0_9_1
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec3
-rw-r--r--packaging/debs/Debian/debian/changelog6
2 files changed, 9 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 30cfb99fe2..3a5cc2b068 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -119,6 +119,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Mon Oct 5 2009 David Wragg <dpw@lshift.net> 1.7.0-1
+- New upstream release
+
* Wed Jun 17 2009 Matthias Radestock <matthias@lshift.net> 1.6.0-1
- New upstream release
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index ac94c8a318..e4cfe7b547 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.7.0-1) intrepid; urgency=low
+
+ * New Upstream Release
+
+ -- David Wragg <dpw@lshift.net> Mon, 05 Oct 2009 13:44:41 +0100
+
rabbitmq-server (1.6.0-1) hardy; urgency=low
* New Upstream Release