[Debian-ha-commits] [pacemaker] 24/69: Fix typos: dependan* -> dependen*
Christoph Berg
myon at debian.org
Tue Jan 26 09:14:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
myon pushed a commit to branch debian/master
in repository pacemaker.
commit ac2c6e901d07c1408651364d71ba3191c72f28a0
Author: Ferenc Wágner <wferi at niif.hu>
Date: Sat Dec 26 11:58:52 2015 +0100
Fix typos: dependan* -> dependen*
Signed-off-by: Ferenc Wágner <wferi at niif.hu>
---
crmd/fsa_defines.h | 2 +-
lib/common/utils.c | 2 +-
pengine/clone.c | 2 +-
pengine/graph.c | 4 ++--
pengine/regression.sh | 12 ++++++------
.../test10/{group-dependants.dot => group-dependents.dot} | 0
.../test10/{group-dependants.exp => group-dependents.exp} | 0
.../{group-dependants.scores => group-dependents.scores} | 0
.../{group-dependants.summary => group-dependents.summary} | 0
.../test10/{group-dependants.xml => group-dependents.xml} | 0
.../{master-dependant-ban.dot => master-dependent-ban.dot} | 0
.../{master-dependant-ban.exp => master-dependent-ban.exp} | 0
...ster-dependant-ban.scores => master-dependent-ban.scores} | 0
...er-dependant-ban.summary => master-dependent-ban.summary} | 0
.../{master-dependant-ban.xml => master-dependent-ban.xml} | 0
xml/regression.sh | 2 +-
16 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/crmd/fsa_defines.h b/crmd/fsa_defines.h
index 4ff35d6..1846b07 100644
--- a/crmd/fsa_defines.h
+++ b/crmd/fsa_defines.h
@@ -238,7 +238,7 @@ enum crmd_fsa_input {
*
* Some of the actions below will always occur together for now, but I can
* forsee that this may not always be the case. So I've spilt them up so
- * that if they ever do need to be called independantly in the future, it
+ * that if they ever do need to be called independently in the future, it
* won't be a problem.
*
* For example, separating A_LRM_CONNECT from A_STARTUP might be useful
diff --git a/lib/common/utils.c b/lib/common/utils.c
index 264e171..24933f6 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1417,7 +1417,7 @@ crm_str_eq(const char *a, const char *b, gboolean use_case)
if (use_case) {
return g_strcmp0(a, b) == 0;
- /* TODO - Figure out which calls, if any, really need to be case independant */
+ /* TODO - Figure out which calls, if any, really need to be case independent */
} else if (a == b) {
return TRUE;
diff --git a/pengine/clone.c b/pengine/clone.c
index 75127e8..66810eb 100644
--- a/pengine/clone.c
+++ b/pengine/clone.c
@@ -411,7 +411,7 @@ color_instance(resource_t * rsc, node_t * prefer, gboolean all_coloc, pe_working
return NULL;
}
- /* Only include positive colocation preferences of dependant resources
+ /* Only include positive colocation preferences of dependent resources
* if not every node will get a copy of the clone
*/
append_parent_colocation(rsc->parent, rsc, all_coloc);
diff --git a/pengine/graph.c b/pengine/graph.c
index 6edd728..4bc23d5 100644
--- a/pengine/graph.c
+++ b/pengine/graph.c
@@ -592,7 +592,7 @@ update_action(action_t * then)
if (changed & pe_graph_updated_first) {
GListPtr lpc2 = NULL;
- crm_trace("Updated %s (first %s %s %s), processing dependants ",
+ crm_trace("Updated %s (first %s %s %s), processing dependents ",
first->uuid,
is_set(first->flags, pe_action_optional) ? "optional" : "required",
is_set(first->flags, pe_action_runnable) ? "runnable" : "unrunnable",
@@ -617,7 +617,7 @@ update_action(action_t * then)
}
if (changed & pe_graph_updated_then) {
- crm_trace("Updated %s (then %s %s %s), processing dependants ",
+ crm_trace("Updated %s (then %s %s %s), processing dependents ",
then->uuid,
is_set(then->flags, pe_action_optional) ? "optional" : "required",
is_set(then->flags, pe_action_runnable) ? "runnable" : "unrunnable",
diff --git a/pengine/regression.sh b/pengine/regression.sh
index 976e936..c547a47 100755
--- a/pengine/regression.sh
+++ b/pengine/regression.sh
@@ -67,7 +67,7 @@ do_test bug-lf-2619 "Move group on clone failure"
do_test group-fail "Ensure stop order is preserved for partially active groups"
do_test group-unmanaged "No need to restart r115 because r114 is unmanaged"
do_test group-unmanaged-stopped "Make sure r115 is stopped when r114 fails"
-do_test group-dependants "Account for the location preferences of things colocated with a group"
+do_test group-dependents "Account for the location preferences of things colocated with a group"
echo ""
do_test rsc_dep1 "Must not "
@@ -138,7 +138,7 @@ do_test clone-require-all-7 "clone A and B both start at the same time. all inst
do_test clone-require-all-no-interleave-1 "C starts everywhere after A and B"
do_test clone-require-all-no-interleave-2 "C starts on nodes 1, 2, and 4 with only one active instance of B"
do_test clone-require-all-no-interleave-3 "C remains active when instance of B is stopped on one node and started on another."
-do_test one-or-more-unrunnnable-instances "Avoid dependancies on instances that wont ever be started"
+do_test one-or-more-unrunnnable-instances "Avoid dependencies on instances that wont ever be started"
echo ""
do_test order1 "Order start 1 "
@@ -151,7 +151,7 @@ do_test order7 "Order (manditory) "
do_test order-optional "Order (score=0) "
do_test order-required "Order (score=INFINITY) "
do_test bug-lf-2171 "Prevent group start when clone is stopped"
-do_test order-clone "Clone ordering should be able to prevent startup of dependant clones"
+do_test order-clone "Clone ordering should be able to prevent startup of dependent clones"
do_test order-sets "Ordering for resource sets"
do_test order-serialize "Serialize resources without inhibiting migration"
do_test order-serialize-set "Serialize a set of resources without inhibiting migration"
@@ -174,7 +174,7 @@ do_test coloc-attr "Colocation based on node attributes"
do_test coloc-negative-group "Negative colocation with a group"
do_test coloc-intra-set "Intra-set colocation"
do_test bug-lf-2435 "Colocation sets with a negative score"
-do_test coloc-clone-stays-active "Ensure clones don't get stopped/demoted because a dependant must stop"
+do_test coloc-clone-stays-active "Ensure clones don't get stopped/demoted because a dependent must stop"
do_test coloc_fp_logic "Verify floating point calculations in colocation are working"
do_test colo_master_w_native "cl#5070 - Verify promotion order is affected when colocating master to native rsc."
do_test colo_slave_w_native "cl#5070 - Verify promotion order is affected when colocating slave to native rsc."
@@ -425,7 +425,7 @@ do_test master_monitor_restart "cl#5072 - Ensure master monitor operation will s
do_test bug-rh-880249 "Handle replacement of an m/s resource with a primitive"
do_test bug-5143-ms-shuffle "Prevent master shuffling due to promotion score"
do_test master-demote-block "Block promotion if demote fails with on-fail=block"
-do_test master-dependant-ban "Don't stop instances from being active because a dependant is banned from that host"
+do_test master-dependent-ban "Don't stop instances from being active because a dependent is banned from that host"
do_test master-stop "Stop instances due to location constraint with role=Started"
do_test master-partially-demoted-group "Allow partially demoted group to finish demoting"
do_test bug-cl-5213 "Ensure role colocation with -INFINITY is enforced"
@@ -476,7 +476,7 @@ do_test 764 "OSDL #764 - Missing monitor op for DoFencing:child_DoFencing:1"
do_test 797 "OSDL #797 - Assert triggered: task_id_i > max_call_id"
do_test 829 "OSDL #829"
do_test 994 "OSDL #994 - Stopping the last resource in a resource group causes the entire group to be restarted"
-do_test 994-2 "OSDL #994 - with a dependant resource"
+do_test 994-2 "OSDL #994 - with a dependent resource"
do_test 1360 "OSDL #1360 - Clone stickiness"
do_test 1484 "OSDL #1484 - on_fail=stop"
do_test 1494 "OSDL #1494 - Clone stability"
diff --git a/pengine/test10/group-dependants.dot b/pengine/test10/group-dependents.dot
similarity index 100%
rename from pengine/test10/group-dependants.dot
rename to pengine/test10/group-dependents.dot
diff --git a/pengine/test10/group-dependants.exp b/pengine/test10/group-dependents.exp
similarity index 100%
rename from pengine/test10/group-dependants.exp
rename to pengine/test10/group-dependents.exp
diff --git a/pengine/test10/group-dependants.scores b/pengine/test10/group-dependents.scores
similarity index 100%
rename from pengine/test10/group-dependants.scores
rename to pengine/test10/group-dependents.scores
diff --git a/pengine/test10/group-dependants.summary b/pengine/test10/group-dependents.summary
similarity index 100%
rename from pengine/test10/group-dependants.summary
rename to pengine/test10/group-dependents.summary
diff --git a/pengine/test10/group-dependants.xml b/pengine/test10/group-dependents.xml
similarity index 100%
rename from pengine/test10/group-dependants.xml
rename to pengine/test10/group-dependents.xml
diff --git a/pengine/test10/master-dependant-ban.dot b/pengine/test10/master-dependent-ban.dot
similarity index 100%
rename from pengine/test10/master-dependant-ban.dot
rename to pengine/test10/master-dependent-ban.dot
diff --git a/pengine/test10/master-dependant-ban.exp b/pengine/test10/master-dependent-ban.exp
similarity index 100%
rename from pengine/test10/master-dependant-ban.exp
rename to pengine/test10/master-dependent-ban.exp
diff --git a/pengine/test10/master-dependant-ban.scores b/pengine/test10/master-dependent-ban.scores
similarity index 100%
rename from pengine/test10/master-dependant-ban.scores
rename to pengine/test10/master-dependent-ban.scores
diff --git a/pengine/test10/master-dependant-ban.summary b/pengine/test10/master-dependent-ban.summary
similarity index 100%
rename from pengine/test10/master-dependant-ban.summary
rename to pengine/test10/master-dependent-ban.summary
diff --git a/pengine/test10/master-dependant-ban.xml b/pengine/test10/master-dependent-ban.xml
similarity index 100%
rename from pengine/test10/master-dependant-ban.xml
rename to pengine/test10/master-dependent-ban.xml
diff --git a/xml/regression.sh b/xml/regression.sh
index ed6b5c8..8f07305 100755
--- a/xml/regression.sh
+++ b/xml/regression.sh
@@ -264,7 +264,7 @@ do_test 764 "OSDL #764"
do_test 797 "OSDL #797"
do_test 829 "OSDL #829"
do_test 994 "OSDL #994"
-do_test 994-2 "OSDL #994 - with a dependant resource"
+do_test 994-2 "OSDL #994 - with a dependent resource"
do_test 1360 "OSDL #1360 - Clone stickiness"
do_test 1484 "OSDL #1484 - on_fail=stop"
do_test 1494 "OSDL #1494 - Clone stability"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git
More information about the Debian-HA-Commits
mailing list