Merge branch 'jenkins-build-13' into 'master'
Auto-merge for build 13 See merge request puppet/puppet_cd!11
This commit is contained in:
@@ -189,8 +189,7 @@
|
||||
91
|
||||
92
|
||||
93
|
||||
94
|
||||
95</pre>
|
||||
94</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span>
|
||||
@@ -272,7 +271,6 @@ class puppet_cd::r10k::webhook (
|
||||
seltype => systemd_unit_file_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_r10k_wh_service_erb),
|
||||
require => Exec['systemctl_daemon_reload'],
|
||||
notify => Exec['systemctl_daemon_reload'],
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,6 @@ class puppet_cd::r10k::webhook (
|
||||
seltype => systemd_unit_file_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_r10k_wh_service_erb),
|
||||
require => Exec['systemctl_daemon_reload'],
|
||||
notify => Exec['systemctl_daemon_reload'],
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user