diff options
| author | Michael Bridgen <mikeb@rabbitmq.com> | 2011-08-23 18:41:02 +0100 |
|---|---|---|
| committer | Michael Bridgen <mikeb@rabbitmq.com> | 2011-08-23 18:41:02 +0100 |
| commit | cedc0b54532a6ce3958a1e07d1e9c31af4e0eff3 (patch) | |
| tree | 2a41b8cce3c8072439eee1fc13b94b41205f2fc1 /packaging | |
| parent | c5bb2b42652d095b96272d12cbe7a770ff79f439 (diff) | |
| parent | 5b8affbb142df2d715f9a2f20cdc880db8507bdb (diff) | |
| download | rabbitmq-server-git-cedc0b54532a6ce3958a1e07d1e9c31af4e0eff3.tar.gz | |
Merge in default. Many conflicts unhappy face
Diffstat (limited to 'packaging')
| -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 ffc826eb0e..11f5f01cbd 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -120,6 +120,9 @@ done rm -rf %{buildroot} %changelog +* Mon Jun 27 2011 simon@rabbitmq.com 2.5.1-1 +- New Upstream Release + * Thu Jun 9 2011 jerryk@vmware.com 2.5.0-1 - New Upstream Release diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 1cab4235dd..9063a6edeb 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,9 @@ +rabbitmq-server (2.5.1-1) lucid; urgency=low + + * New Upstream Release + + -- Simon MacMullen <simon@rabbitmq.com> Mon, 27 Jun 2011 11:21:49 +0100 + rabbitmq-server (2.5.0-1) lucid; urgency=low * New Upstream Release |
