fix duplicate declaration

Tim Meusel · Tim Meusel · commit 7bdf8d4d8c7c · 2015-03-09T14:05:54.000+01:00
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -337,7 +337,7 @@
         }
       }
     }
-    ini_setting {'puppetagentserializationformat':
+    ini_setting {'puppetagentserializationformatagent':
       setting => 'preferred_serialization_format',
       value   => $serialization_format,
     }
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -341,7 +341,7 @@
         }
       }
     }
-    ini_setting {'puppetagentserializationformat':
+    ini_setting {'puppetagentserializationformatmaster':
       setting => 'preferred_serialization_format',
       value   => $serialization_format,
     }

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`	`}`
`340`		`- ini_setting {'puppetagentserializationformat':`
	`340`	`+ ini_setting {'puppetagentserializationformatagent':`
`341`	`341`	`setting => 'preferred_serialization_format',`
`342`	`342`	`value => $serialization_format,`
`343`	`343`	`}`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`	`}`
`344`		`- ini_setting {'puppetagentserializationformat':`
	`344`	`+ ini_setting {'puppetagentserializationformatmaster':`
`345`	`345`	`setting => 'preferred_serialization_format',`
`346`	`346`	`value => $serialization_format,`
`347`	`347`	`}`