From 6cf903d8fe6170979b7d2ac8432d5623d7d850ecaf3c3b7fe4b9cc3bb70b4fdf Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 15 Jul 2016 10:47:33 +0000 Subject: [PATCH 1/2] Accepting request 408670 from home:yan_gao:branches:network:ha-clustering:Factory:Test - libcrmcommon: properly handle XML comments when comparing v2 patchset diffs - crmd: don't abort transitions for CIB comment changes - libcrmcommon: log XML comments correctly - libcrmcommon: remove extraneous format specifier from log message - crm_mon: Avoid logging errors for any CIB changes that we don't care about (bsc#986931) - crmd: When node load was reduced, crmd carries out a feasible action. - Upstream version cs: 58fef06198fef17873d0d2e2d0cc5c7db73c5724 OBS-URL: https://build.opensuse.org/request/show/408670 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=250 --- _service | 2 +- pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 | 3 --- pacemaker-1.1.15+git20160708.58fef06.tar.bz2 | 3 +++ pacemaker.changes | 11 +++++++++++ pacemaker.spec | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 create mode 100644 pacemaker-1.1.15+git20160708.58fef06.tar.bz2 diff --git a/_service b/_service index aae6e18..b9f83c9 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.15 --> 1.1.15+git%cd.%h - 630d0d112092042b6f79c2a02bb442e82fee93ec + 58fef06198fef17873d0d2e2d0cc5c7db73c5724 diff --git a/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 b/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 deleted file mode 100644 index 41d70dd..0000000 --- a/pacemaker-1.1.15+git20160701.630d0d1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9587853126135f54777779084e9ea2946536d02a6e06b93695ee215d4c535179 -size 3844245 diff --git a/pacemaker-1.1.15+git20160708.58fef06.tar.bz2 b/pacemaker-1.1.15+git20160708.58fef06.tar.bz2 new file mode 100644 index 0000000..f18a618 --- /dev/null +++ b/pacemaker-1.1.15+git20160708.58fef06.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c853cd797b8ebac28da639b84d3d1ce89bb201d86e299a95690f8eb4584a982 +size 3844575 diff --git a/pacemaker.changes b/pacemaker.changes index 6bc55f4..183b4ce 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jul 8 09:58:46 UTC 2016 - ygao@suse.com + +- libcrmcommon: properly handle XML comments when comparing v2 patchset diffs +- crmd: don't abort transitions for CIB comment changes +- libcrmcommon: log XML comments correctly +- libcrmcommon: remove extraneous format specifier from log message +- crm_mon: Avoid logging errors for any CIB changes that we don't care about (bsc#986931) +- crmd: When node load was reduced, crmd carries out a feasible action. +- Upstream version cs: 58fef06198fef17873d0d2e2d0cc5c7db73c5724 + ------------------------------------------------------------------- Fri Jul 1 23:10:54 UTC 2016 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index a759640..7b72b48 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -35,7 +35,7 @@ # We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere %bcond_with doc Name: pacemaker -Version: 1.1.15+git20160701.630d0d1 +Version: 1.1.15+git20160708.58fef06 Release: 0 Summary: Scalable High-Availability cluster resource manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ From 81f4e50356de84548d4610a9f2272afe0572993c79f02dc1c812a371c4e6e3cb Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 15 Jul 2016 10:53:47 +0000 Subject: [PATCH 2/2] Accepting request 408672 from home:yan_gao:branches:network:ha-clustering:Factory:Test - crmd/pengine: implement on-fail=ignore without allow-fail (bsc#981731) - crmd/pengine: handle on-fail=ignore properly (bsc#981731) - crmd: respect start-failure-is-fatal even for artifically injected events (bsc#981731) - crmd: don't update fail count twice for same failure (bsc#950450, bsc#981731) - crmd: report operation rc as advertised instead of status (bsc#981731) OBS-URL: https://build.opensuse.org/request/show/408672 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=251 --- pacemaker.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pacemaker.changes b/pacemaker.changes index 183b4ce..bf764db 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -673,14 +673,14 @@ Fri May 15 13:07:29 UTC 2015 - ygao@suse.com ------------------------------------------------------------------- Mon May 11 10:51:23 UTC 2015 - ygao@suse.com -- crmd/pengine: implement on-fail=ignore without allow-fail +- crmd/pengine: implement on-fail=ignore without allow-fail (bsc#981731) - pengine: Prevent use-after-free in sort_rsc_process_order() (bsc#930368) - crmd: Prevent the old version of DC from being fenced when it shuts down for rolling-upgrade (bsc#929955) - 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 (bsc#950450) -- crmd: report operation rc as advertised instead of status +- crmd/pengine: handle on-fail=ignore properly (bsc#981731) +- crmd: respect start-failure-is-fatal even for artifically injected events (bsc#981731) +- crmd: don't update fail count twice for same failure (bsc#950450, bsc#981731) +- crmd: report operation rc as advertised instead of status (bsc#981731) - xml: add RelaxNG schema for crm_mon XML output - Upstream version cs: c9ad9cd503f071391efe17d3c45d578d6f152acd