summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 21:11:53 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 21:11:53 +0000
commit46aeff751500474a67854f9d407263c9b6dd4abf (patch)
tree1ec9e46af900bd6c9c546508e97eea495812451d
parentf6faaf98193591f63cb3400a45c2f48def555033 (diff)
parent1066241957ef8131e75adafeebb4251bea7eb544 (diff)
Merge "Fix a typo"
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_2.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 8b900842..4b323854 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -41,7 +41,7 @@ done
# https://bugzilla.redhat.com/show_bug.cgi?id=1341968
#
# The default is to determine automatically if upgrade is needed based
-# on mysql package versionning, but this can be overriden manually
+# on mysql package versioning, but this can be overridden manually
# to support specific upgrade scenario
# Calling this function will set the DO_MYSQL_UPGRADE variable which is used
@@ -109,7 +109,7 @@ yum -y -q update
# We need to ensure at least those two configuration settings, otherwise
# mariadb 10.1+ won't activate galera replication.
# wsrep_cluster_address must only be set though, its value does not
-# matter because it's overriden by the galera resource agent.
+# matter because it's overridden by the galera resource agent.
cat >> /etc/my.cnf.d/galera.cnf <<EOF
[mysqld]
wsrep_on = ON