# HG changeset patch
# User Virginia Wray <virginia.wray@oracle.com>
# Date 1375284995 21600
# Node ID cbda05bf5f9d6c03a06d4a2aa69a2b7812fe3d07
# Parent  9eeb516d9fdd783375757e82405a1a7718fe9cd9
17242868 Need to set the start method for the Puppet service to default to disabled.
17243548 The puppet.xml template entry needs updating

diff -r 9eeb516d9fdd -r cbda05bf5f9d components/puppet/files/puppet.xml
--- a/components/puppet/files/puppet.xml	Wed Jul 31 08:09:01 2013 -0700
+++ b/components/puppet/files/puppet.xml	Wed Jul 31 09:36:35 2013 -0600
@@ -43,6 +43,7 @@
             <service_fmri value='svc:/system/filesystem/minimal' />
     </dependency>
 
+    <exec_method type='method' name='start' exec=':true' timeout_seconds='60' />
     <exec_method type='method' name='stop' exec=':kill' timeout_seconds='60' />
 
     <property_group name='general' type='framework'>
@@ -87,7 +88,7 @@
     <template>
         <common_name>
             <loctext xml:lang='C'>
-            Puppet version 3.1.1
+            Puppet version 3.2.2
             </loctext>
         </common_name>
         <documentation>