diff options
author | Tim Watson <tim@rabbitmq.com> | 2013-05-28 12:35:34 +0100 |
---|---|---|
committer | Tim Watson <tim@rabbitmq.com> | 2013-05-28 12:35:34 +0100 |
commit | d089852250c747e6aef5b88f9e8c953b0f9dbf36 (patch) | |
tree | 98362cfcab456fb70f0f90712411ea5e1fe23160 | |
parent | d4c1dd230e08fe9794a4508c52030d1c6290e73a (diff) | |
parent | 8e222d809d2ae84ca9b70ab180224f62e83234e4 (diff) | |
download | rabbitmq-server-d089852250c747e6aef5b88f9e8c953b0f9dbf36.tar.gz |
merge stable into default
-rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 3 | ||||
-rw-r--r-- | packaging/debs/Debian/debian/changelog | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 7b57cb2f..607719cf 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 fe5310c8..8dffefb0 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 |