diff --git a/_service b/_service index 61af58c..5f39f92 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370 + da5aaab97ca5b7858f2aac98107a1a7ffc3e4252 diff --git a/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2 b/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2 deleted file mode 100644 index 38c46f5..0000000 --- a/pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4cc85b40e123df2acd689817d0157e3016e51aa6506bf921e53fdab86c624c3 -size 9384593 diff --git a/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 b/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 new file mode 100644 index 0000000..655c883 --- /dev/null +++ b/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea75089b844325190b73cab5ec138b00b4581a9bf91fa8a5ea2dd32f91291a8 +size 9378846 diff --git a/pacemaker.changes b/pacemaker.changes index 478529a..d4ebb86 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 12 09:20:16 UTC 2014 - ygao@suse.com + +- pengine: Use "#site-name" in rules for setting site-specific instance attributes +- pengine: Use "#cluster-name" in rules for setting cluster-specific instance attributes (FATE#316118) +- crmd: Set "cluster-name" property to corosync's "cluster_name" by default for corosync-2 (FATE#316118) +- pengine: Fixed so that it could change while a setup of "startup-fencing" starts. +- crmd: Use correctly signed inputs to sscanf() +- PE: Correctly handle origin offsets in the future +- iso8601: Different logic is needed when logging and calculating durations +- xml: Do not prune meaningful leaves from v1 patchsets +- Upstream version cs: da5aaab97ca5b7858f2aac98107a1a7ffc3e4252 + ------------------------------------------------------------------- Thu May 8 11:30:57 CEST 2014 - ro@suse.de @@ -11,6 +24,7 @@ Mon May 5 07:42:25 UTC 2014 - ygao@suse.com * pacemaker-colocated-utilization.patch - xml: Clean up schema list at exit +- pengine: Support site-specific instance attributes based on rules for stretch cluster - pengine: Support cluster-specific instance attributes based on rules (FATE#316118) - crmd: Ensure crm_config options are re-read on updates - Resolve all clang analyser defects diff --git a/pacemaker.spec b/pacemaker.spec index 9f9b610..bc73141 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,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+git20140505.42ae0e3 +Version: 1.1.11+git20140512.da5aaab Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org