Commit 88c5c319 authored by Daniel Black's avatar Daniel Black

Merge branch '10.1' of https://github.com/MariaDB/server into 10.1

parents 053653a2 4c192279
...@@ -15,8 +15,13 @@ ConditionPathExists= ...@@ -15,8 +15,13 @@ ConditionPathExists=
Type=oneshot Type=oneshot
Restart=no Restart=no
# Don't install or try to prepare for galera SST.
ExecStartPre=
# Override the multi instance service for a bootstrap start instance # Override the multi instance service for a bootstrap start instance
ExecStart= ExecStart=
ExecStart=/usr/bin/echo "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster" ExecStart=/usr/bin/echo "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster"
ExecStart=/usr/bin/false ExecStart=/usr/bin/false
# This isn't a service meant to execute anything but a message
ExecStartPost=
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment