[Debian-ha-commits] [pacemaker] 06/09: Added patches to fix spelling and formatting in manuals
Richard Winters
devrik-guest at moszumanska.debian.org
Thu Apr 30 00:52:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository pacemaker.
commit 755656aa757af9dee9eede889219390d1c230d3c
Author: Richard B Winters <rik at mmogp.com>
Date: Wed Apr 29 19:41:42 2015 -0400
Added patches to fix spelling and formatting in manuals
- Series updated
---
...-spelling-error-in-binary-libtransitioner.patch | 30 +++++++
...0-Fix-spelling-error-in-binary-pacemakerd.patch | 26 ++++++
...ix-spelling-error-in-binary-libcrmservice.patch | 26 ++++++
...Fix-spelling-error-in-binary-libpe-status.patch | 26 ++++++
...3-Fix-spelling-error-in-binary-libpengine.patch | 55 +++++++++++++
...-Fix-spelling-errors-in-binary-libpengine.patch | 50 +++++++++++
.../0015-Fix-spelling-error-in-binary-crmd.patch | 40 +++++++++
.../0016-Fix-spelling-error-in-binary-crmd.patch | 35 ++++++++
...017-Fix-spelling-error-in-binary-stonithd.patch | 35 ++++++++
...ix-spelling-errors-in-binary-crm_resource.patch | 96 ++++++++++++++++++++++
...hen-used-as-minus-sign-in-crm_attribute-8.patch | 25 ++++++
...hen-used-as-minus-sign-in-attrd_updater-8.patch | 25 ++++++
...s-bad-whatis-entry-ocf_pacemaker_remote-7.patch | 27 ++++++
debian/patches/series | 13 +++
14 files changed, 509 insertions(+)
diff --git a/debian/patches/0009-Fix-spelling-error-in-binary-libtransitioner.patch b/debian/patches/0009-Fix-spelling-error-in-binary-libtransitioner.patch
new file mode 100644
index 0000000..10956e9
--- /dev/null
+++ b/debian/patches/0009-Fix-spelling-error-in-binary-libtransitioner.patch
@@ -0,0 +1,30 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:17:05 -0400
+Subject: Fix spelling error in binary libtransitioner
+
+ - Fixed spelling of dependency from dependancy in
+ lib/transition/utils.c
+
+Change-Id: I3c6e53d9ae7726193603512990f2f130d9bede47
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ lib/transition/utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/transition/utils.c b/lib/transition/utils.c
+index c1b5467..d5b6626 100644
+--- a/lib/transition/utils.c
++++ b/lib/transition/utils.c
+@@ -200,10 +200,10 @@ print_synapse(unsigned int log_level, crm_graph_t * graph, synapse_t * synapse)
+
+ if (find_action(graph, input->id) == NULL) {
+ if (host == NULL) {
+- do_crm_log(log_level, " * [Input %2d]: Unresolved dependancy %s op %s",
++ do_crm_log(log_level, " * [Input %2d]: Unresolved dependency %s op %s",
+ input->id, actiontype2text(input->type), key);
+ } else {
+- do_crm_log(log_level, " * [Input %2d]: Unresolved dependancy %s op %s on %s",
++ do_crm_log(log_level, " * [Input %2d]: Unresolved dependency %s op %s on %s",
+ input->id, actiontype2text(input->type), key, host);
+ }
+ }
diff --git a/debian/patches/0010-Fix-spelling-error-in-binary-pacemakerd.patch b/debian/patches/0010-Fix-spelling-error-in-binary-pacemakerd.patch
new file mode 100644
index 0000000..0422e27
--- /dev/null
+++ b/debian/patches/0010-Fix-spelling-error-in-binary-pacemakerd.patch
@@ -0,0 +1,26 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:22:30 -0400
+Subject: Fix spelling error in binary pacemakerd
+
+ - Fixed spelling of initialize from initalize in
+ mcp/pacemaker.c
+
+Change-Id: I5a61e41e1028392222c57f4ee32c46665d9ef3cf
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ mcp/pacemaker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
+index 5f9a796..90b1807 100644
+--- a/mcp/pacemaker.c
++++ b/mcp/pacemaker.c
+@@ -315,7 +315,7 @@ start_child(pcmk_child_t * child)
+
+ /* Keep the root group (so we can access corosync), but add the haclient group (so we can access ipc) */
+ } else if (initgroups(child->uid, gid) < 0) {
+- crm_err("Cannot initalize groups for %s: %s (%d)", child->uid, pcmk_strerror(errno), errno);
++ crm_err("Cannot initialize groups for %s: %s (%d)", child->uid, pcmk_strerror(errno), errno);
+ }
+ }
+
diff --git a/debian/patches/0011-Fix-spelling-error-in-binary-libcrmservice.patch b/debian/patches/0011-Fix-spelling-error-in-binary-libcrmservice.patch
new file mode 100644
index 0000000..5883e84
--- /dev/null
+++ b/debian/patches/0011-Fix-spelling-error-in-binary-libcrmservice.patch
@@ -0,0 +1,26 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:26:01 -0400
+Subject: Fix spelling error in binary libcrmservice
+
+ - Fixed spelling of invocation from invokation in
+ lib/services/services_linux.c
+
+Change-Id: Ifc42b62d15a3c698ec5c9d7879d8d0e2e305ab74
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ lib/services/services_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/services/services_linux.c b/lib/services/services_linux.c
+index 1c326ba..c167265 100644
+--- a/lib/services/services_linux.c
++++ b/lib/services/services_linux.c
+@@ -219,7 +219,7 @@ recurring_action_timer(gpointer data)
+ {
+ svc_action_t *op = data;
+
+- crm_debug("Scheduling another invokation of %s", op->id);
++ crm_debug("Scheduling another invocation of %s", op->id);
+
+ /* Clean out the old result */
+ free(op->stdout_data);
diff --git a/debian/patches/0012-Fix-spelling-error-in-binary-libpe-status.patch b/debian/patches/0012-Fix-spelling-error-in-binary-libpe-status.patch
new file mode 100644
index 0000000..f6304b3
--- /dev/null
+++ b/debian/patches/0012-Fix-spelling-error-in-binary-libpe-status.patch
@@ -0,0 +1,26 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:30:00 -0400
+Subject: Fix spelling error in binary libpe-status
+
+ - Fixed spelling of don't from dont in
+ lib/pengine/unpack.c
+
+Change-Id: I9230f7d8ddca9d94aa6318492699aa16ed99aaa1
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ lib/pengine/unpack.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
+index b699201..b475c16 100644
+--- a/lib/pengine/unpack.c
++++ b/lib/pengine/unpack.c
+@@ -2916,7 +2916,7 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op,
+ switch (status) {
+ case PCMK_LRM_OP_CANCELLED:
+ /* do nothing?? */
+- pe_err("Dont know what to do for cancelled ops yet");
++ pe_err("Don't know what to do for cancelled ops yet");
+ break;
+
+ case PCMK_LRM_OP_PENDING:
diff --git a/debian/patches/0013-Fix-spelling-error-in-binary-libpengine.patch b/debian/patches/0013-Fix-spelling-error-in-binary-libpengine.patch
new file mode 100644
index 0000000..8e1fda0
--- /dev/null
+++ b/debian/patches/0013-Fix-spelling-error-in-binary-libpengine.patch
@@ -0,0 +1,55 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:42:26 -0400
+Subject: Fix spelling error in binary libpengine
+
+ - Fixed spelling of dependency from dependancy in
+ lib/pengine/utils.c
+
+Change-Id: Ib910924e41bd968921d4aa830696925f23d1aff9
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ lib/pengine/utils.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
+index 7423af1..5d3fcb3 100644
+--- a/lib/pengine/utils.c
++++ b/lib/pengine/utils.c
+@@ -1752,7 +1752,7 @@ order_actions(action_t * lh_action, action_t * rh_action, enum pe_ordering order
+
+ crm_trace("Ordering Action %s before %s", lh_action->uuid, rh_action->uuid);
+
+- /* Ensure we never create a dependancy on ourselves... its happened */
++ /* Ensure we never create a dependency on ourselves... its happened */
+ CRM_ASSERT(lh_action != rh_action);
+
+ /* Filter dups, otherwise update_action_states() has too much work to do */
+@@ -2059,7 +2059,7 @@ pe_fence_op(node_t * node, const char *op, bool optional, pe_working_set_t * dat
+
+ void
+ trigger_unfencing(
+- resource_t * rsc, node_t *node, const char *reason, action_t *dependancy, pe_working_set_t * data_set)
++ resource_t * rsc, node_t *node, const char *reason, action_t *dependency, pe_working_set_t * data_set)
+ {
+ if(is_not_set(data_set->flags, pe_flag_enable_unfencing)) {
+ /* No resources require it */
+@@ -2076,8 +2076,8 @@ trigger_unfencing(
+ action_t *unfence = pe_fence_op(node, "on", FALSE, data_set);
+
+ crm_notice("Unfencing %s: %s", node->details->uname, reason);
+- if(dependancy) {
+- order_actions(unfence, dependancy, pe_order_optional);
++ if(dependency) {
++ order_actions(unfence, dependency, pe_order_optional);
+ }
+
+ } else if(rsc) {
+@@ -2086,7 +2086,7 @@ trigger_unfencing(
+ g_hash_table_iter_init(&iter, rsc->allowed_nodes);
+ while (g_hash_table_iter_next(&iter, NULL, (void **)&node)) {
+ if(node->details->online && node->details->unclean == FALSE && node->details->shutdown == FALSE) {
+- trigger_unfencing(rsc, node, reason, dependancy, data_set);
++ trigger_unfencing(rsc, node, reason, dependency, data_set);
+ }
+ }
+ }
diff --git a/debian/patches/0014-Fix-spelling-errors-in-binary-libpengine.patch b/debian/patches/0014-Fix-spelling-errors-in-binary-libpengine.patch
new file mode 100644
index 0000000..60dc8a4
--- /dev/null
+++ b/debian/patches/0014-Fix-spelling-errors-in-binary-libpengine.patch
@@ -0,0 +1,50 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 20:23:27 -0400
+Subject: Fix spelling errors in binary libpengine
+
+ - Fixed spelling of dependency from dependancy, as well as of
+ maintenance from maintainence in pengine/graph.c
+
+Change-Id: Ia0418b91f58f93150128d42a22e799c945b578b8
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pengine/graph.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pengine/graph.c b/pengine/graph.c
+index 7160bbf..a0aef6b 100644
+--- a/pengine/graph.c
++++ b/pengine/graph.c
+@@ -496,7 +496,7 @@ update_action(action_t * then)
+ changed |= graph_update_action(first, then, node, first_flags, otype);
+
+ /* 'first' was for a complex resource (clone, group, etc),
+- * create a new dependancy if necessary
++ * create a new dependency if necessary
+ */
+ } else if (order_actions(first, then, other->type)) {
+ /* This was the first time 'first' and 'then' were associated,
+@@ -574,7 +574,7 @@ shutdown_constraints(node_t * node, action_t * shutdown_op, pe_working_set_t * d
+ } else if (action->node->details != node->details) {
+ continue;
+ } else if (is_set(action->rsc->flags, pe_rsc_maintenance)) {
+- pe_rsc_trace(action->rsc, "Skipping %s: maintainence mode", action->uuid);
++ pe_rsc_trace(action->rsc, "Skipping %s: maintenance mode", action->uuid);
+ continue;
+ } else if (node->details->maintenance) {
+ pe_rsc_trace(action->rsc, "Skipping %s: node %s is in maintenance mode",
+@@ -913,12 +913,12 @@ should_dump_action(action_t * action)
+ } else if (safe_str_neq(wrapper->action->task, RSC_START)) {
+ /* Only interested in start operations */
+ } else if (is_set(wrapper->action->flags, pe_action_dumped)) {
+- crm_trace("action %d (%s) dependancy of %s",
++ crm_trace("action %d (%s) dependency of %s",
+ action->id, action->uuid, wrapper->action->uuid);
+ return TRUE;
+
+ } else if (should_dump_action(wrapper->action)) {
+- crm_trace("action %d (%s) dependancy of %s",
++ crm_trace("action %d (%s) dependency of %s",
+ action->id, action->uuid, wrapper->action->uuid);
+ return TRUE;
+ }
diff --git a/debian/patches/0015-Fix-spelling-error-in-binary-crmd.patch b/debian/patches/0015-Fix-spelling-error-in-binary-crmd.patch
new file mode 100644
index 0000000..aa44a27
--- /dev/null
+++ b/debian/patches/0015-Fix-spelling-error-in-binary-crmd.patch
@@ -0,0 +1,40 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:51:55 -0400
+Subject: Fix spelling error in binary crmd
+
+ - Fixed spelling of Don't from Dont in
+ crmd/messages.c and crmd/te_events.c
+
+Change-Id: I0226066f479634ca6db5142d1cf39b2a818d870a
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ crmd/messages.c | 2 +-
+ crmd/te_events.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crmd/messages.c b/crmd/messages.c
+index bc3bad3..e307a96 100644
+--- a/crmd/messages.c
++++ b/crmd/messages.c
+@@ -251,7 +251,7 @@ delete_fsa_input(fsa_data_t * fsa_data)
+
+ case fsa_dt_none:
+ if (fsa_data->data != NULL) {
+- crm_err("Dont know how to free %s data from %s",
++ crm_err("Don't know how to free %s data from %s",
+ fsa_cause2string(fsa_data->fsa_cause), fsa_data->origin);
+ crmd_exit(pcmk_err_generic);
+ }
+diff --git a/crmd/te_events.c b/crmd/te_events.c
+index 02e1534..85a64ee 100644
+--- a/crmd/te_events.c
++++ b/crmd/te_events.c
+@@ -319,7 +319,7 @@ match_graph_event(int action_id, xmlNode * event, const char *event_node,
+ break;
+ case PCMK_LRM_OP_CANCELLED:
+ /* do nothing?? */
+- crm_err("Dont know what to do for cancelled ops yet");
++ crm_err("Don't know what to do for cancelled ops yet");
+ break;
+ default:
+ action->failed = TRUE;
diff --git a/debian/patches/0016-Fix-spelling-error-in-binary-crmd.patch b/debian/patches/0016-Fix-spelling-error-in-binary-crmd.patch
new file mode 100644
index 0000000..63bd779
--- /dev/null
+++ b/debian/patches/0016-Fix-spelling-error-in-binary-crmd.patch
@@ -0,0 +1,35 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:52:31 -0400
+Subject: Fix spelling error in binary crmd
+
+ - Fixed spelling of Noticeable from Noticable in
+ crmd/throttle.c
+
+Change-Id: Ia97d10d38b0b66df6aefe634a3c48bafd56031b8
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ crmd/throttle.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crmd/throttle.c b/crmd/throttle.c
+index bb873e0..f3c29dd 100644
+--- a/crmd/throttle.c
++++ b/crmd/throttle.c
+@@ -415,7 +415,7 @@ throttle_handle_load(float load, const char *desc, int cores)
+ return throttle_med;
+
+ } else if(adjusted_load > THROTTLE_FACTOR_LOW * throttle_load_target) {
+- crm_debug("Noticable %s detected: %f", desc, load);
++ crm_debug("Noticeable %s detected: %f", desc, load);
+ return throttle_low;
+ }
+
+@@ -467,7 +467,7 @@ throttle_mode(void)
+ mode |= throttle_med;
+
+ } else if(load > cib_max_cpu * 0.8) {
+- crm_debug("Noticable %s detected: %f", desc, load);
++ crm_debug("Noticeable %s detected: %f", desc, load);
+ mode |= throttle_low;
+
+ } else {
diff --git a/debian/patches/0017-Fix-spelling-error-in-binary-stonithd.patch b/debian/patches/0017-Fix-spelling-error-in-binary-stonithd.patch
new file mode 100644
index 0000000..80eb5cb
--- /dev/null
+++ b/debian/patches/0017-Fix-spelling-error-in-binary-stonithd.patch
@@ -0,0 +1,35 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 18:55:23 -0400
+Subject: Fix spelling error in binary stonithd
+
+ - Fixed spelling of Unknown from Unkown in
+ fencing/commands.c
+
+Change-Id: I7d70b1b3fd300952d6bc93fb550d0b20775c0a93
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ fencing/commands.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fencing/commands.c b/fencing/commands.c
+index 3ec215a..5f84247 100644
+--- a/fencing/commands.c
++++ b/fencing/commands.c
+@@ -772,7 +772,7 @@ status_search_cb(GPid pid, int rc, const char *output, gpointer user_data)
+ dev->active_pid = 0;
+ mainloop_set_trigger(dev->work);
+
+- if (rc == 1 /* unkown */ ) {
++ if (rc == 1 /* unknown */ ) {
+ crm_trace("Host %s is not known by %s", search->host, dev->id);
+
+ } else if (rc == 0 /* active */ || rc == 2 /* inactive */ ) {
+@@ -780,7 +780,7 @@ status_search_cb(GPid pid, int rc, const char *output, gpointer user_data)
+ can = TRUE;
+
+ } else {
+- crm_notice("Unkown result when testing if %s can fence %s: rc=%d", dev->id, search->host,
++ crm_notice("Unknown result when testing if %s can fence %s: rc=%d", dev->id, search->host,
+ rc);
+ }
+ search_devices_record_result(search, dev->id, can);
diff --git a/debian/patches/0018-Fix-spelling-errors-in-binary-crm_resource.patch b/debian/patches/0018-Fix-spelling-errors-in-binary-crm_resource.patch
new file mode 100644
index 0000000..0fa62b9
--- /dev/null
+++ b/debian/patches/0018-Fix-spelling-errors-in-binary-crm_resource.patch
@@ -0,0 +1,96 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 19:03:52 -0400
+Subject: Fix spelling errors in binary crm_resource
+
+ - Fixed spelling of dependent from dependant, as well as
+ dependencies from dependancies in tools/crm_resource.c
+
+Change-Id: I49d87d81ac2961c26e2c2958f7f5995732c1f6e9
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ tools/crm_resource.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index adbdf09..0810c72 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -596,7 +596,7 @@ set_resource_attr(const char *rsc_id, const char *attr_set, const char *attr_id,
+ }
+ }
+
+- crm_debug("Looking for dependancies %p", rsc->rsc_cons_lhs);
++ crm_debug("Looking for dependencies %p", rsc->rsc_cons_lhs);
+ set_bit(rsc->flags, pe_rsc_allocating);
+ for (lpc = rsc->rsc_cons_lhs; lpc != NULL; lpc = lpc->next) {
+ rsc_colocation_t *cons = (rsc_colocation_t *) lpc->data;
+@@ -605,7 +605,7 @@ set_resource_attr(const char *rsc_id, const char *attr_set, const char *attr_id,
+ crm_debug("Checking %s %d", cons->id, cons->score);
+ if (cons->score > 0 && is_not_set(peer->flags, pe_rsc_allocating)) {
+ /* Don't get into colocation loops */
+- crm_debug("Setting %s=%s for dependant resource %s", attr_name, attr_value, peer->id);
++ crm_debug("Setting %s=%s for dependent resource %s", attr_name, attr_value, peer->id);
+ set_resource_attr(peer->id, NULL, NULL, attr_name, attr_value, recursive, cib, data_set);
+ }
+ }
+@@ -1176,7 +1176,7 @@ show_location(resource_t * rsc, const char *prefix)
+ }
+
+ static void
+-show_colocation(resource_t * rsc, gboolean dependants, gboolean recursive, int offset)
++show_colocation(resource_t * rsc, gboolean dependents, gboolean recursive, int offset)
+ {
+ char *prefix = NULL;
+ GListPtr lpc = NULL;
+@@ -1185,7 +1185,7 @@ show_colocation(resource_t * rsc, gboolean dependants, gboolean recursive, int o
+ prefix = calloc(1, (offset * 4) + 1);
+ memset(prefix, ' ', offset * 4);
+
+- if (dependants) {
++ if (dependents) {
+ list = rsc->rsc_cons_lhs;
+ }
+
+@@ -1203,26 +1203,26 @@ show_colocation(resource_t * rsc, gboolean dependants, gboolean recursive, int o
+ char *score = NULL;
+ resource_t *peer = cons->rsc_rh;
+
+- if (dependants) {
++ if (dependents) {
+ peer = cons->rsc_lh;
+ }
+
+ if (is_set(peer->flags, pe_rsc_allocating)) {
+- if (dependants == FALSE) {
++ if (dependents == FALSE) {
+ fprintf(stdout, "%s%-*s (id=%s - loop)\n", prefix, 80 - (4 * offset), peer->id,
+ cons->id);
+ }
+ continue;
+ }
+
+- if (dependants && recursive) {
+- show_colocation(peer, dependants, recursive, offset + 1);
++ if (dependents && recursive) {
++ show_colocation(peer, dependents, recursive, offset + 1);
+ }
+
+ score = score2char(cons->score);
+ if (cons->role_rh > RSC_ROLE_STARTED) {
+ fprintf(stdout, "%s%-*s (score=%s, %s role=%s, id=%s)\n", prefix, 80 - (4 * offset),
+- peer->id, score, dependants ? "needs" : "with", role2text(cons->role_rh),
++ peer->id, score, dependents ? "needs" : "with", role2text(cons->role_rh),
+ cons->id);
+ } else {
+ fprintf(stdout, "%s%-*s (score=%s, id=%s)\n", prefix, 80 - (4 * offset),
+@@ -1231,8 +1231,8 @@ show_colocation(resource_t * rsc, gboolean dependants, gboolean recursive, int o
+ show_location(peer, prefix);
+ free(score);
+
+- if (!dependants && recursive) {
+- show_colocation(peer, dependants, recursive, offset + 1);
++ if (!dependents && recursive) {
++ show_colocation(peer, dependents, recursive, offset + 1);
+ }
+ }
+ free(prefix);
diff --git a/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch b/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
new file mode 100644
index 0000000..39a6928
--- /dev/null
+++ b/debian/patches/0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
@@ -0,0 +1,25 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 19:07:32 -0400
+Subject: Fixed hyphen-used-as-minus-sign in crm_attribute 8
+
+ - Escaped '-n' in tools/crm_atrribute.c
+
+Change-Id: Ic283c973604cf93d1f8f1cc0ea4fcefac43942f0
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ tools/crm_attribute.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/crm_attribute.c b/tools/crm_attribute.c
+index 60d39b6..a9b42e3 100644
+--- a/tools/crm_attribute.c
++++ b/tools/crm_attribute.c
+@@ -125,7 +125,7 @@ main(int argc, char **argv)
+ int is_remote_node = 0;
+
+ crm_log_cli_init("crm_attribute");
+- crm_set_options(NULL, "command -n attribute [options]", long_options,
++ crm_set_options(NULL, "command \\-n attribute [options]", long_options,
+ "Manage node's attributes and cluster options."
+ "\n\nAllows node attributes and cluster options to be queried, modified and deleted.\n");
+
diff --git a/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch b/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
new file mode 100644
index 0000000..a39da27
--- /dev/null
+++ b/debian/patches/0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
@@ -0,0 +1,25 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 19:11:46 -0400
+Subject: Fixed hyphen-used-as-minus-sign in attrd_updater 8
+
+ - Escaped '-n' in tools/attrd_updater.c
+
+Change-Id: Iad70fffe5d4bbf2d24f2dd809130d0b6cc46bf9d
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ tools/attrd_updater.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/attrd_updater.c b/tools/attrd_updater.c
+index 54b2c60..f5be46f 100644
+--- a/tools/attrd_updater.c
++++ b/tools/attrd_updater.c
+@@ -75,7 +75,7 @@ main(int argc, char **argv)
+ int flag;
+
+ crm_log_cli_init("attrd_updater");
+- crm_set_options(NULL, "command -n attribute [options]", long_options,
++ crm_set_options(NULL, "command \\-n attribute [options]", long_options,
+ "Tool for updating cluster node attributes");
+
+ if (argc < 2) {
diff --git a/debian/patches/0021-manpage-has-bad-whatis-entry-ocf_pacemaker_remote-7.patch b/debian/patches/0021-manpage-has-bad-whatis-entry-ocf_pacemaker_remote-7.patch
new file mode 100644
index 0000000..6f3abbc
--- /dev/null
+++ b/debian/patches/0021-manpage-has-bad-whatis-entry-ocf_pacemaker_remote-7.patch
@@ -0,0 +1,27 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Wed, 29 Apr 2015 19:35:54 -0400
+Subject: manpage-has-bad-whatis-entry ocf_pacemaker_remote 7
+
+ - Added short description prior to <parameters> in
+ extra/resources
+
+Change-Id: Id18aabb07dff8f12126181b12f72df3fcbec6cde
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ extra/resources/remote | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/extra/resources/remote b/extra/resources/remote
+index 9e0482b..88ff2b9 100644
+--- a/extra/resources/remote
++++ b/extra/resources/remote
+@@ -44,7 +44,8 @@ meta_data() {
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+ <resource-agent name="remote" version="0.1">
+- <version>0.1</version>
++<version>0.1</version>
++<shortdesc lang="en">remote resource agent</shortdesc>
+ <parameters>
+ <parameter name="server" unique="1">
+ <longdesc lang="en">
diff --git a/debian/patches/series b/debian/patches/series
index 551d75b..4bdc6c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,16 @@
0006-Re-enable-Default-Start-Stop.patch
0007-Fix-acl-Do-not-delay-evaluation-of-added-nodes.patch
0008-Fix-init-script-missing-dependency-on-remote_fs.patch
+0009-Fix-spelling-error-in-binary-libtransitioner.patch
+0010-Fix-spelling-error-in-binary-pacemakerd.patch
+0011-Fix-spelling-error-in-binary-libcrmservice.patch
+0012-Fix-spelling-error-in-binary-libpe-status.patch
+0013-Fix-spelling-error-in-binary-libpengine.patch
+0014-Fix-spelling-errors-in-binary-libpengine.patch
+0015-Fix-spelling-error-in-binary-crmd.patch
+0016-Fix-spelling-error-in-binary-crmd.patch
+0017-Fix-spelling-error-in-binary-stonithd.patch
+0018-Fix-spelling-errors-in-binary-crm_resource.patch
+0019-Fixed-hyphen-used-as-minus-sign-in-crm_attribute-8.patch
+0020-Fixed-hyphen-used-as-minus-sign-in-attrd_updater-8.patch
+0021-manpage-has-bad-whatis-entry-ocf_pacemaker_remote-7.patch
--
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