diff --git a/_service b/_service index 1e94a79..f6ece4d 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - d63eaf41fa8173de3e29873d0461bfb888b83b37 + 76579e813b5aaa1972d400055233519f58bbc0c6 diff --git a/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 b/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 deleted file mode 100644 index 5b9407f..0000000 --- a/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ef19e4dd66153e27c3ff5c1a461724783af84c9c599bac19ab557dc8f8e7a20 -size 9369566 diff --git a/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 b/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 new file mode 100644 index 0000000..4b5d52d --- /dev/null +++ b/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d65215d2f953f8b55af918ebfb716d301fadc2351717a6aecc5e9e169768a9 +size 9433858 diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch index 7b3e288..bf079ce 100644 --- a/pacemaker-pengine-nvpair-id-ref-test.patch +++ b/pacemaker-pengine-nvpair-id-ref-test.patch @@ -1,11 +1,11 @@ -commit 8165b88cb8ef05c82631a20c089b64c5ee419ac9 +commit 9077dde4ae249fee4cb6e8d3a1d09f45607b1250 Author: Gao,Yan -Date: Fri Mar 7 16:08:29 2014 +0800 +Date: Tue Apr 8 19:41:49 2014 +0800 Test: pengine: Support id-ref in nvpair with optional "name" diff --git a/pengine/regression.sh b/pengine/regression.sh -index 07c3c35..6c52811 100755 +index e436d93..43a9895 100755 --- a/pengine/regression.sh +++ b/pengine/regression.sh @@ -93,6 +93,7 @@ do_test params-5 "Params: Restart based on probe digest" @@ -47,7 +47,7 @@ index 0000000..f3aaaa5 +} diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp new file mode 100644 -index 0000000..bad4db0 +index 0000000..0ad069d --- /dev/null +++ b/pengine/test10/nvpair-id-ref.exp @@ -0,0 +1,135 @@ @@ -142,7 +142,7 @@ index 0000000..bad4db0 + + + -+ ++ + + + @@ -157,7 +157,7 @@ index 0000000..bad4db0 + + + -+ ++ + + + @@ -178,10 +178,10 @@ index 0000000..bad4db0 + + + -+ ++ + + -+ ++ + + + @@ -237,11 +237,11 @@ index 0000000..dbe685f + diff --git a/pengine/test10/nvpair-id-ref.xml b/pengine/test10/nvpair-id-ref.xml new file mode 100644 -index 0000000..9b3e28f +index 0000000..5580e96 --- /dev/null +++ b/pengine/test10/nvpair-id-ref.xml @@ -0,0 +1,56 @@ -+ ++ + + + @@ -280,8 +280,8 @@ index 0000000..9b3e28f + + + -+ -+ ++ ++ + + + @@ -290,7 +290,7 @@ index 0000000..9b3e28f + + + -+ ++ + + + diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch index 19ab147..f28a7d6 100644 --- a/pacemaker-pengine-nvpair-id-ref.patch +++ b/pacemaker-pengine-nvpair-id-ref.patch @@ -1,4 +1,4 @@ -commit f81b9a3f0eb134df35f1d29742ffe12cbeb74ded +commit 3912538a8954158d44a57f23aa219c5529a170ab Author: Gao,Yan Date: Wed Jan 29 14:07:44 2014 +0800 @@ -64,25 +64,29 @@ index f80aa47..626d7b2 100644 } sorted = g_list_sort(unsorted, sort_pairs); -diff --git a/xml/Makefile.am b/xml/Makefile.am -index 4a7381b..87340fb 100644 ---- a/xml/Makefile.am -+++ b/xml/Makefile.am -@@ -26,7 +26,7 @@ RNG_FILES = $(VERSIONED_RNG_FILES:%.rng=%-1.0.rng) \ - $(VERSIONED_RNG_FILES:%.rng=%-1.2.rng) \ - $(VERSIONED_RNG_FILES:%.rng=%-next.rng) \ - pacemaker.rng versions.rng score.rng rule.rng nvset.rng \ -- fencing.rng -+ fencing.rng nvset-1.0.rng - - EXTRA_DIST = crm-1.0.dtd $(dtd_SCRIPTS) - dtd_SCRIPTS = crm.dtd $(RNG_FILES) upgrade06.xsl upgrade11.xsl crm-transitional.dtd -diff --git a/xml/nvset-1.0.rng b/xml/nvset-1.0.rng +diff --git a/xml/nodes-1.3.rng b/xml/nodes-1.3.rng +index c28b5df..1ded570 100644 +--- a/xml/nodes-1.3.rng ++++ b/xml/nodes-1.3.rng +@@ -30,10 +30,10 @@ + + + +- ++ + + +- ++ + + + +diff --git a/xml/nvset-1.3.rng b/xml/nvset-1.3.rng new file mode 100644 -index 0000000..0d7e72c +index 0000000..8f1696c --- /dev/null -+++ b/xml/nvset-1.0.rng -@@ -0,0 +1,35 @@ ++++ b/xml/nvset-1.3.rng +@@ -0,0 +1,45 @@ + + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/xml/nvset.rng b/xml/nvset.rng -index 0d7e72c..8f1696c 100644 ---- a/xml/nvset.rng -+++ b/xml/nvset.rng -@@ -17,11 +17,21 @@ - - - -- -- -- -- -- + + + @@ -146,63 +121,49 @@ index 0d7e72c..8f1696c 100644 + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/xml/resources-1.3.rng b/xml/resources-1.3.rng +index a3640d1..9faf9fc 100644 +--- a/xml/resources-1.3.rng ++++ b/xml/resources-1.3.rng +@@ -53,7 +53,7 @@ + + + +- ++ - - -diff --git a/xml/pacemaker-1.0.rng b/xml/pacemaker-1.0.rng -index 7100393..93e5e5f 100644 ---- a/xml/pacemaker-1.0.rng -+++ b/xml/pacemaker-1.0.rng -@@ -15,7 +15,7 @@ - - - -- -+ - - - -@@ -23,7 +23,7 @@ - - - -- -+ - - + + +@@ -86,7 +86,7 @@ + + + +- ++ -@@ -32,7 +32,7 @@ - - - -- -+ - - - -@@ -94,7 +94,7 @@ - - - -- -+ - - - -diff --git a/xml/resources-1.0.rng b/xml/resources-1.0.rng -index 7ea2228..743ccba 100644 ---- a/xml/resources-1.0.rng -+++ b/xml/resources-1.0.rng -@@ -95,10 +95,10 @@ + + +@@ -144,10 +144,10 @@ - -+ ++ - -+ ++ diff --git a/pacemaker.changes b/pacemaker.changes index 2d1d41d..e3bb075 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Apr 4 10:46:58 UTC 2014 - ygao@suse.com + +- crmd: Correctly react to successful unfencing operations +- PE: Delay unfencing until after we know the state of all resources that require unfencing +- PE: Fencing devices default to only requiring quorum in order to start +- PE: Automatically re-unfence a node if the fencing device definition changes +- pengine: Only report 'migrate' in transition summary if migration is actually taking place +- crm_node: Set correct subsystem in node rm cache msg +- crm_node: Prevent use-after-free in tools_remove_node_cache() +- crmd: make resource ID case sensitive +- fencing: Correction of the registration from a difference. +- crm_report: Add support for ISO8601 time format in logs (bnc#870886) +- PE: Potential memory leak +- xml: Support resources that require unfencing +- crmd: make node_state erase correctly +- xml: Add the ability to have lightweight schema revisions +- xml: Split up the RelaxNG schema files so they're easier to version individually +- crm_get_msec: prevent integer overflow +- corosync: Reduce log severity for a redundant message (bnc#870624) +- attrd: Reduce log severity for normal messages (bnc#870624) +- cib: When data was old, it fixed so that the newest cib might not be acquired. +- crm_attribute: Default --lifetime to forever when using --node (bnc#870696) +- Upstream version cs: 76579e813b5aaa1972d400055233519f58bbc0c6 + ------------------------------------------------------------------- Mon Mar 31 07:19:00 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index e9a8e99..8e558ad 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -95,7 +95,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.11+git20140328.d63eaf4 +Version: 1.1.11+git20140404.76579e8 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org