diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-06 16:52:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-06 16:52:56 +0100 |
| commit | a780596029eee0dd03d1e4ad0ad37d845413d5a1 (patch) | |
| tree | ffa12e4bce3db3da937178a0473e348f484862e5 /package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c | |
| parent | c8faacfd346a1956e44f05ee3d48e74ffc1f6521 (diff) | |
| parent | 8aae553b7ad9fc0b3c3cc41488541b7e5096c8cf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c')
| -rw-r--r-- | package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c deleted file mode 100644 index 1882093d5..000000000 --- a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c +++ /dev/null @@ -1,32 +0,0 @@ ---- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c 2011-08-03 13:54:23.000000000 +0200 -+++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c 2011-10-07 16:15:59.000000000 +0200 -@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc) - argv[1], cib_error2string(rc)); - } else { - buffer = crm_concat("fail-count", argv[2], '-'); -- delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL, -+ delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, - NULL, buffer, NULL, FALSE); - crm_free(dest_node); - crm_free(buffer); -@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc) - sleep(2); /* wait for the refresh */ - now_s = crm_itoa(now); - update_attr(cib_conn, cib_sync_call, -- XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); -+ XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); - crm_free(now_s); - - crmd_channel->ops->destroy(crmd_channel); -@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc - strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1); - } - -+ /* - if(is_set(rsc->flags, pe_rsc_failure_ignored)) { - strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1); - } -+ */ - - ret = mgmt_msg_append(ret, buf); - break; |