summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-03-02 19:30:42 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-03-02 19:30:42 +0300
commit188d7a06e21d75220d0d0a718164f717a92cb70e (patch)
tree1b0d78fe3bcdafa0077e8d34c0820777b7a25adb /packaging
parent11a09bd729af49e843ddefec8d82425111f7a972 (diff)
parentc2b0c69b4d6eb366c215933e0d8320f2b66bc4ab (diff)
downloadrabbitmq-server-git-188d7a06e21d75220d0d0a718164f717a92cb70e.tar.gz
Merge branch 'stable' into rabbitmq-server-398
Diffstat (limited to 'packaging')
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec3
-rw-r--r--packaging/debs/Debian/debian/changelog6
-rw-r--r--packaging/windows-exe/rabbitmq_nsi.in2
3 files changed, 11 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 7cf3177400..2826ad3ffc 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -130,6 +130,9 @@ done
rm -rf %{buildroot}
%changelog
+* Tue Mar 1 2016 michael@rabbitmq.com 3.6.1-1
+- New Upstream Release
+
* Tue Dec 22 2015 michael@rabbitmq.com 3.6.0-1
- New Upstream Release
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 372afa8258..adf8ce5aa5 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.6.1-1) unstable; urgency=low
+
+ * New Upstream Release
+
+ -- Michael Klishin <michael@rabbitmq.com> Tue, 01 Mar 2016 13:19:57 +0000
+
rabbitmq-server (3.6.0-1) unstable; urgency=low
* New Upstream Release
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index 3c868b91e7..e66d2a99ed 100644
--- a/packaging/windows-exe/rabbitmq_nsi.in
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -10,6 +10,8 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
!define uninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ"
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
;--------------------------------
; Third-party functions