diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-03-11 16:17:25 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-03-11 16:17:25 +0100 |
| commit | 17a5da8f085e4d4acb349fc41ceca0e923ac67d3 (patch) | |
| tree | 6d3b51561ea384f3b51f477b05d91237ebe1f3e7 /packaging | |
| parent | e03e7da3115c54e8a7ca54ad3cc2c4c74f7ed417 (diff) | |
| parent | 578cfc1916a4b6a8202b2f4698e35eb76942f061 (diff) | |
| download | rabbitmq-server-git-17a5da8f085e4d4acb349fc41ceca0e923ac67d3.tar.gz | |
Merge branch 'master' into stable
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 3 | ||||
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 6 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 05781f8b85..962e4c879a 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -128,6 +128,9 @@ done rm -rf %{buildroot} %changelog +* Wed Mar 11 2015 jean-sebastien@rabbitmq.com 3.5.0-1 +- New Upstream Release + * Wed Feb 11 2015 michael@rabbitmq.com 3.4.4-1 - New Upstream Release diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 1949dacae8..c9508847f9 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -30,14 +30,14 @@ cd /var/lib/rabbitmq SCRIPT=`basename $0` if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then - /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ + exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@ elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then if [ -f $PWD/.erlang.cookie ] ; then export HOME=. fi - /usr/lib/rabbitmq/bin/${SCRIPT} "$@" + exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@" elif [ `id -u` = 0 ] ; then - @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" + exec @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" else /usr/lib/rabbitmq/bin/${SCRIPT} echo diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 242ac9d701..b2c805b3ad 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,9 @@ +rabbitmq-server (3.5.0-1) unstable; urgency=low + + * New Upstream Release + + -- Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> Wed, 11 Mar 2015 13:56:19 +0000 + rabbitmq-server (3.4.4-1) unstable; urgency=low * New Upstream Release |