1 files changed, 21 insertions, 0 deletions
diff --git a/xml/test-2/033-clu-props-move-merge.xml b/xml/test-2/033-clu-props-move-merge.xml
new file mode 100644
index 0000000..c34085b
--- /dev/null
+++ b/xml/test-2/033-clu-props-move-merge.xml
@@ -0,0 +1,21 @@
+<?xml-stylesheet href="../assets/upgrade-2.10-htmldiff.xsl" type="text/xsl"?>
+<cib validate-with="pacemaker-2.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cluster-opts">
+        <nvpair id="cluster-opts-default-action-timeout" name="default-action-timeout" value="30s"/>
+        <nvpair id="cluster-opts-default-resource-stickiness" name="default-resource-stickiness" value="100"/>
+        <nvpair id="cluster-opts-is-managed-default" name="is-managed-default" value="true"/>
+      </cluster_property_set>
+    </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="rsc-defaults">
+        <nvpair id="rsc-defaults-is-managed" name="is-managed" value="false"/>
+      </meta_attributes>
+    </rsc_defaults>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>