Merge branch 'stable'

Conflicts:
	packaging/RPMS/Fedora/rabbitmq-server.service
	packaging/debs/Debian/debian/rabbitmq-server.service

Author: michaelklishin

packaging/RPMS/Fedora/rabbitmq-server.service

@@ -16,15 +16,12 @@ TimeoutStartSec=3600
 # in the event of a failure. systemd service restarts are not a
 # replacement for service monitoring. Please see
 # http://www.rabbitmq.com/monitoring.html
-# Restart docs: https://www.freedesktop.org/software/systemd/man/systemd.service.html#Restart=
-# RestartSec docs: https://www.freedesktop.org/software/systemd/man/systemd.service.html#RestartSec=
-#
-# SuccessExitStatus: rabbitmq/rabbitmq-server-release#51
 Restart=on-failure
 RestartSec=10
 WorkingDirectory=/var/lib/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl shutdown
+# See rabbitmq/rabbitmq-server-release#51
 SuccessExitStatus=69
 
 [Install]

packaging/debs/Debian/debian/rabbitmq-server.service

@@ -14,12 +14,12 @@ TimeoutStartSec=3600
 # in the event of a failure. systemd service restarts are not a
 # replacement for service monitoring. Please see
 # http://www.rabbitmq.com/monitoring.html
-Restart=on-failure # https://www.freedesktop.org/software/systemd/man/systemd.service.html#Restart=
-RestartSec=10      # https://www.freedesktop.org/software/systemd/man/systemd.service.html#RestartSec=
+Restart=on-failure
+RestartSec=10
 WorkingDirectory=/var/lib/rabbitmq
 ExecStart=/usr/lib/rabbitmq/bin/rabbitmq-server
 ExecStop=/usr/lib/rabbitmq/bin/rabbitmqctl shutdown
-SuccessExitStatus=69 # rabbitmq/rabbitmq-server-release#51
+# See rabbitmq/rabbitmq-server-release#51
 
 [Install]
 WantedBy=multi-user.target