diff --git a/_service b/_service
index 45ca833..01ec0a9 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
1.1.11
-->
1.1.11+git%cd.%h
- d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59
+ 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202
diff --git a/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 b/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2
deleted file mode 100644
index 9e08756..0000000
--- a/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a8b6f8aea3b0ba4e27778358871643c9b0af410b0ce40fcd09604eca77cb32b
-size 9436232
diff --git a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
new file mode 100644
index 0000000..330ce04
--- /dev/null
+++ b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5e3e3b0ec854e1b571bebe4f22a6628357ebb0894299055815ac4f5b34ffbb0
+size 9428490
diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch
deleted file mode 100644
index bf079ce..0000000
--- a/pacemaker-pengine-nvpair-id-ref-test.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-commit 9077dde4ae249fee4cb6e8d3a1d09f45607b1250
-Author: Gao,Yan
-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 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"
- do_test novell-251689 "Resource definition change + target_role=stopped"
- do_test bug-lf-2106 "Restart all anonymous clone instances after config change"
- do_test params-6 "Params: Detect reload in previously migrated resource"
-+do_test nvpair-id-ref "Support id-ref in nvpair with optional name"
-
- echo ""
- do_test target-0 "Target Role : baseline"
-diff --git a/pengine/test10/nvpair-id-ref.dot b/pengine/test10/nvpair-id-ref.dot
-new file mode 100644
-index 0000000..f3aaaa5
---- /dev/null
-+++ b/pengine/test10/nvpair-id-ref.dot
-@@ -0,0 +1,23 @@
-+digraph "g" {
-+"probe_complete node1" -> "probe_complete" [ style = bold]
-+"probe_complete node1" [ style=bold color="green" fontcolor="black"]
-+"probe_complete node2" -> "probe_complete" [ style = bold]
-+"probe_complete node2" [ style=bold color="green" fontcolor="black"]
-+"probe_complete" -> "rsc1_start_0 node2" [ style = bold]
-+"probe_complete" -> "rsc2_start_0 node1" [ style = bold]
-+"probe_complete" [ style=bold color="green" fontcolor="orange"]
-+"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
-+"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
-+"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
-+"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
-+"rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
-+"rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold]
-+"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"]
-+"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
-+"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
-+"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
-+"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
-+"rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
-+"rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold]
-+"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"]
-+}
-diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp
-new file mode 100644
-index 0000000..0ad069d
---- /dev/null
-+++ b/pengine/test10/nvpair-id-ref.exp
-@@ -0,0 +1,135 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/pengine/test10/nvpair-id-ref.scores b/pengine/test10/nvpair-id-ref.scores
-new file mode 100644
-index 0000000..fb86bf6
---- /dev/null
-+++ b/pengine/test10/nvpair-id-ref.scores
-@@ -0,0 +1,7 @@
-+Allocation scores:
-+native_color: rsc1 allocation score on node1: 0
-+native_color: rsc1 allocation score on node2: 0
-+native_color: rsc2 allocation score on node1: 0
-+native_color: rsc2 allocation score on node2: 0
-+native_color: rsc_stonith allocation score on node1: 0
-+native_color: rsc_stonith allocation score on node2: 0
-diff --git a/pengine/test10/nvpair-id-ref.summary b/pengine/test10/nvpair-id-ref.summary
-new file mode 100644
-index 0000000..dbe685f
---- /dev/null
-+++ b/pengine/test10/nvpair-id-ref.summary
-@@ -0,0 +1,30 @@
-+
-+Current cluster status:
-+Online: [ node1 node2 ]
-+
-+ rsc_stonith (stonith:null): Started node1
-+ rsc1 (ocf::pacemaker:Dummy): Stopped
-+ rsc2 (ocf::pacemaker:Dummy): Stopped
-+
-+Transition Summary:
-+ * Start rsc1 (node2)
-+ * Start rsc2 (node1)
-+
-+Executing cluster transition:
-+ * Resource action: rsc1 monitor on node2
-+ * Resource action: rsc1 monitor on node1
-+ * Resource action: rsc2 monitor on node2
-+ * Resource action: rsc2 monitor on node1
-+ * Pseudo action: probe_complete
-+ * Resource action: rsc1 start on node2
-+ * Resource action: rsc2 start on node1
-+ * Resource action: rsc1 monitor=10000 on node2
-+ * Resource action: rsc2 monitor=10000 on node1
-+
-+Revised cluster status:
-+Online: [ node1 node2 ]
-+
-+ rsc_stonith (stonith:null): Started node1
-+ rsc1 (ocf::pacemaker:Dummy): Started node2
-+ rsc2 (ocf::pacemaker:Dummy): Started node1
-+
-diff --git a/pengine/test10/nvpair-id-ref.xml b/pengine/test10/nvpair-id-ref.xml
-new file mode 100644
-index 0000000..5580e96
---- /dev/null
-+++ b/pengine/test10/nvpair-id-ref.xml
-@@ -0,0 +1,56 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch
deleted file mode 100644
index f28a7d6..0000000
--- a/pacemaker-pengine-nvpair-id-ref.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-commit 3912538a8954158d44a57f23aa219c5529a170ab
-Author: Gao,Yan
-Date: Wed Jan 29 14:07:44 2014 +0800
-
- Feature: pengine: Support id-ref in nvpair with optional "name"
-
- If "name" isn't specified, it inherits the name from the referenced
- nvpair.
-
-diff --git a/lib/pengine/rules.c b/lib/pengine/rules.c
-index f80aa47..626d7b2 100644
---- a/lib/pengine/rules.c
-+++ b/lib/pengine/rules.c
-@@ -607,7 +607,7 @@ sort_pairs(gconstpointer a, gconstpointer b)
- }
-
- static void
--populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite)
-+populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite, xmlNode * top)
- {
- const char *name = NULL;
- const char *value = NULL;
-@@ -622,10 +622,18 @@ populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite)
-
- for (an_attr = __xml_first_child(list); an_attr != NULL; an_attr = __xml_next(an_attr)) {
- if (crm_str_eq((const char *)an_attr->name, XML_CIB_TAG_NVPAIR, TRUE)) {
-+ xmlNode *ref_nvpair = expand_idref(an_attr, top);
-+
- name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME);
-+ if (name == NULL) {
-+ name = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_NAME);
-+ }
-
- crm_trace("Setting attribute: %s", name);
- value = crm_element_value(an_attr, XML_NVPAIR_ATTR_VALUE);
-+ if (value == NULL) {
-+ value = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_VALUE);
-+ }
-
- if (name == NULL || value == NULL) {
- continue;
-@@ -657,6 +665,7 @@ struct unpack_data_s {
- GHashTable *node_hash;
- GHashTable *hash;
- crm_time_t *now;
-+ xmlNode *top;
- };
-
- static void
-@@ -670,7 +679,7 @@ unpack_attr_set(gpointer data, gpointer user_data)
- }
-
- crm_trace("Adding attributes from %s", pair->name);
-- populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite);
-+ populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite, unpack_data->top);
- }
-
- void
-@@ -717,6 +726,7 @@ unpack_instance_attributes(xmlNode * top, xmlNode * xml_obj, const char *set_nam
- data.node_hash = node_hash;
- data.now = now;
- data.overwrite = overwrite;
-+ data.top = top;
- }
-
- sorted = g_list_sort(unsorted, sort_pairs);
-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..8f1696c
---- /dev/null
-+++ b/xml/nvset-1.3.rng
-@@ -0,0 +1,45 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-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 @@
-
-
-
--
-+
-
-
-
-@@ -86,7 +86,7 @@
-
-
-
--
-+
-
-
-
-@@ -144,10 +144,10 @@
-
-
-
--
-+
-
-
--
-+
-
-
-
diff --git a/pacemaker.changes b/pacemaker.changes
index 97012b1..f9f8922 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 9 04:41:38 UTC 2014 - ygao@suse.com
+
+- pengine: Support id-ref in nvpair with optional "name" (FATE#316118)
+ Drop the patches that have been merged upstream:
+ * pacemaker-pengine-nvpair-id-ref.patch
+ * pacemaker-pengine-nvpair-id-ref-test.patch
+- Upstream version cs: 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202
+
-------------------------------------------------------------------
Tue Apr 8 13:34:59 UTC 2014 - ygao@suse.com
diff --git a/pacemaker.spec b/pacemaker.spec
index a728052..2dee292 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+git20140408.d9fbba5
+Version: 1.1.11+git20140409.6442c5a
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@@ -111,8 +111,6 @@ Patch4: pacemaker-colocated-utilization.patch
Patch5: pacemaker-cibsecret-tool-temp-disabled.patch
Patch6: pacemaker-nagios-plugin-dir.patch
Patch7: bug-812269_pacemaker-fencing-device-register-messages.patch
-Patch8: pacemaker-pengine-nvpair-id-ref.patch
-Patch9: pacemaker-pengine-nvpair-id-ref-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0
@@ -397,8 +395,6 @@ manager for Corosync, CMAN and/or Linux-HA.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
# Force the local time
#