summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-05-28 12:35:34 +0100
committerTim Watson <tim@rabbitmq.com>2013-05-28 12:35:34 +0100
commit3f957b98565606dd199cc2e174e55e31d8055e79 (patch)
tree98362cfcab456fb70f0f90712411ea5e1fe23160 /packaging
parenta8f622b89420688912740ffda94c39566aebb14d (diff)
parent0a4dc3b24d63895efd469a4b39e96e956c5966b0 (diff)
downloadrabbitmq-server-git-3f957b98565606dd199cc2e174e55e31d8055e79.tar.gz
merge stable into default
Diffstat (limited to 'packaging')
-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 7b57cb2fd3..607719cf94 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -123,6 +123,9 @@ done
rm -rf %{buildroot}
%changelog
+* Mon May 20 2013 tim@rabbitmq.com 3.1.1-1
+- Test release
+
* Wed May 1 2013 simon@rabbitmq.com 3.1.0-1
- New Upstream Release
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index fe5310c855..8dffefb0af 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.1.1-1) unstable; urgency=low
+
+ * Test release
+
+ -- Tim Watson <tim@rabbitmq.com> Mon, 20 May 2013 16:21:20 +0100
+
rabbitmq-server (3.1.0-1) unstable; urgency=low
* New Upstream Release