summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-02-19 17:12:08 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-02-19 17:12:08 +0000
commit173260d91e1f10ba0e5ef2cd16889ccd5bb28dab (patch)
treeb8b323ef208d833760fcce21b86e860a8b513a6b /packaging
parent5e10fa5b9ec26c8934b477007a83e556cbac719f (diff)
parent1b511b72c6ac58a21157e08349344ca5a23894e5 (diff)
downloadrabbitmq-server-git-173260d91e1f10ba0e5ef2cd16889ccd5bb28dab.tar.gz
Merge branch 'master' into rabbitmq-server-550
Conflicts: scripts/rabbitmq-env.bat
Diffstat (limited to 'packaging')
-rw-r--r--packaging/windows-exe/rabbitmq_nsi.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index 71123ebbed..ae1585c372 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