Merge branch 'branches/rudder/4.3' into branches/rudder/5.0

Normation · Dec 4, 2018 · 1f7b7e3 · 1f7b7e3
2 parents c638064 + e1e1388
commit 1f7b7e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rudder-jetty/SOURCES/patches/jetty/jetty-init-lsb-fix-debian.patch b/rudder-jetty/SOURCES/patches/jetty/jetty-init-lsb-fix-debian.patch
@@ -10,7 +10,7 @@
 +# Required-Stop:     $local_fs $remote_fs $network $syslog
 +# Default-Start:     2 3 4 5
 +# Default-Stop:      0 1 6
-+# Short-Description: Jetty 7 webserver
++# Short-Description: Jetty webserver
 +# Description:       Jetty init script modified by Normation
 +### END INIT INFO
 +

diff --git a/rudder-jetty/SOURCES/patches/jetty/jetty-init-lsb-fix-rpm.patch b/rudder-jetty/SOURCES/patches/jetty/jetty-init-lsb-fix-rpm.patch
@@ -14,7 +14,7 @@
 +# Required-Stop:                $local_fs $remote_fs $network
 +# Default-Start:                3 5
 +# Default-Stop:                 0 1 2 6
-+# Short-Description:            Jetty 7 webserver
++# Short-Description:            Jetty webserver
 +# Description:                  Jetty init script modified by Normation
 +### END INIT INFO
 +