diff --git a/_service b/_service index a6356dc..8d2d6ca 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.13 --> 1.1.13+git%cd.%h - 7906df92a713052db1edae851579ea229d8a5393 + 577898dc4ac1efdb5989a996cb5f9ac60ed2eb7a diff --git a/bug-949441_pacemaker-fencing-provider-internal.patch b/bug-949441_pacemaker-fencing-provider-internal.patch deleted file mode 100644 index da9d4c0..0000000 --- a/bug-949441_pacemaker-fencing-provider-internal.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 61835593b43a5e0d29287f24fa5500f950b2bf6b -Author: Gao,Yan -Date: Mon Oct 5 17:44:13 2015 +0200 - - Fix: fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error - -diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c -index b8f3967..b9fef3e 100644 ---- a/lib/fencing/st_client.c -+++ b/lib/fencing/st_client.c -@@ -1499,8 +1499,13 @@ get_stonith_provider(const char *agent, const char *provider) - #endif - } - -- crm_err("No such device: %s", agent); -- return NULL; -+ if (safe_str_eq(provider, "internal")) { -+ return provider; -+ -+ } else { -+ crm_err("No such device: %s", agent); -+ return NULL; -+ } - } - - static gint diff --git a/pacemaker-1.1.13+git20151008.7906df9.tar.bz2 b/pacemaker-1.1.13+git20151008.7906df9.tar.bz2 deleted file mode 100644 index bf5a23f..0000000 --- a/pacemaker-1.1.13+git20151008.7906df9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bff29041961161497f858c6b73b7d823a9571e57be75428c55287d3b5967db9e -size 3729538 diff --git a/pacemaker-1.1.13+git20151105.577898d.tar.bz2 b/pacemaker-1.1.13+git20151105.577898d.tar.bz2 new file mode 100644 index 0000000..ed2c407 --- /dev/null +++ b/pacemaker-1.1.13+git20151105.577898d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f608f02bd8ac0fdd6ec4b9a227fc13d7b603edc547b32986ac1dfe556785c19 +size 3715071 diff --git a/pacemaker.changes b/pacemaker.changes index 2608378..61c1afc 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Nov 5 22:51:27 UTC 2015 - ygao@suse.com + +- CTS: add "try except" to deal with errors that raw_input gets EOFError and add "--yes" to skip interaction (bsc#953192) +- Upstream version cs: 577898dc4ac1efdb5989a996cb5f9ac60ed2eb7a + +------------------------------------------------------------------- +Wed Nov 4 11:42:56 UTC 2015 - ygao@suse.com + +- crm_resource: Correctly clean up all children for anonymous cloned groups (bsc#950128) +- services: Directly add operations into in-flight list in the execution functions (bsc#952874) +- systemd: Return PCMK_OCF_UNKNOWN_ERROR instead of PCMK_OCF_NOT_INSTALLED for uncertain errors on LoadUnit (bsc#952884) +- systemd: Return FALSE for systemd_mask_error() if it only maps an error instead of masking one (bsc#952884) +- dbus: Correctly return the result for pcmk_dbus_find_error() no matter if there's a DBusError passed in (bsc#952884) +- services: Prevent potential use-after-free when trying to add an operation into in-flight list (bsc#952874) +- systemd: Directly return an error if the connection to System DBus is closed (bsc#952874) +- services: Correctly determine if operations are in-flight (bsc#952874) +- systemd: Reconnect to System DBus if the connection is closed (bsc#931271) +- lrmd: Finalize all pending and recurring operations when cleaning up a resource (bsc#950450) +- fencing: don't poke peers when remote node status changes +- attrd: don't try to communicate with attrd on a remote node +- libcluster,crmd: never update join info or processes for remote nodes +- cib: Increased paranoia when peer updates fail to apply in compatability mode +- crmd: do not accept remote peer data as enough for startup +- crmd: remote nodes can't be DC so never add them to stonith cleanup list +- libcluster: never autoreap from remote peer cache +- crmd: improve generation of node state +- CTS: get Reattach test working again and up-to-date (bsc#953192) +- libcommon: Ignore CDATA of metadata of the resource. +- cib: Downgrade the log message on forwarding CRM_OP_NOOP requests from INFO to DEBUG (bsc#949267) + +- fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error (bsc#949441) + * Drop bug-949441_pacemaker-fencing-provider-internal.patch which has been merged upstream + +- Upstream version cs: 7bd00f3f3010bc10d13b87e2ff501b597ea6ca03 + ------------------------------------------------------------------- Thu Oct 8 10:31:45 UTC 2015 - ygao@suse.com @@ -297,7 +333,7 @@ Mon May 11 10:51:23 UTC 2015 - ygao@suse.com - xml: Fix upgrade-1.3.xsl to correctly transform ACL rules with "attribute" (bsc#929681) - crmd/pengine: handle on-fail=ignore properly - crmd: respect start-failure-is-fatal even for artifically injected events -- crmd: don't update fail count twice for same failure +- crmd: don't update fail count twice for same failure (bsc#950450) - crmd: report operation rc as advertised instead of status - xml: add RelaxNG schema for crm_mon XML output - Upstream version cs: c9ad9cd503f071391efe17d3c45d578d6f152acd @@ -375,10 +411,10 @@ Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com - lrmd: preserve exit reason string when isolation wrappers are in use - docker-wrapper: properly separate docker and resource specific attributes - docker-wrapper: set authkey file permissions and properly set container 'node name' during start -- systemd: Trick systemd into not stopping our services before us during shutdown +- systemd: Trick systemd into not stopping our services before us during shutdown (bsc#913251) - mcp: Allow a configurable delay when debugging shutdown issues -- systemd: Kindly ask dbus NOT to kill the process if the dbus connection fails -- systemd: Tell systemd not to take DBus down from underneath us +- systemd: Kindly ask dbus NOT to kill the process if the dbus connection fails (bsc#931271) +- systemd: Tell systemd not to take DBus down from underneath us (bsc#913251) - cib: Correctly set up signal handlers - PE: Do not record duplicate copies of the failed actions - lrmd: enable ipc proxy for docker-wrapper privileged mode @@ -497,7 +533,7 @@ Fri Jan 9 12:10:09 UTC 2015 - ygao@suse.com - crmd: Handle remote connection failures while executing ops on remote connection - remote: Treat recv msg timeout as a disconnect - pengine: properly recover remote-nodes when cluster-node proxy goes offline -- systemd: Correctly handle long running stop actions +- systemd: Correctly handle long running stop actions (bsc#948989) - crm_resource: Include group members when calculating the next timeout - crm_resource: Ensure --restart sets/clears meta attributes - crm_resource: Clean up memory in --restart error paths diff --git a/pacemaker.spec b/pacemaker.spec index 23fc196..bc0d846 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -100,7 +100,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.13+git20151008.7906df9 +Version: 1.1.13+git20151105.577898d Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -116,7 +116,6 @@ Patch5: pacemaker-nagios-plugin-dir.patch Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch Patch7: pacemaker-Wno-format-signedness.patch Patch8: bug-943295_pacemaker-lrmd-log-notice.patch -Patch9: bug-949441_pacemaker-fencing-provider-internal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: pacemaker-ticket-support = 2.0 Conflicts: heartbeat < 3.0 @@ -399,7 +398,6 @@ manager for Corosync, CMAN and/or Linux-HA. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 # Force the local time #