confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request 12ww1160/cd_nagios!97
This commit is contained in:
Arne Teuke
2018-04-12 13:04:03 +02:00
parent 5ca0a86ce6 6ed24bfbf5
commit f73d2f8bc8
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/cabaddfa1be2932">cabaddfa1be2932</a> Jenkins ConfDroid <i>2018-04-12 10:15:02</i>
<p>
<h3>recommit for updates in build 1</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/7dd65e515c82ad2">7dd65e515c82ad2</a> Arne Teuke <i>2018-04-12 10:13:28</i>
<p>
<h3>added development branch</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/8574fbd5f27d160">8574fbd5f27d160</a> Arne Teuke <i>2017-09-27 12:42:23</i>
<p>
<h3>fixed typo</h3>

2
README.md
View File

@@ -104,7 +104,7 @@ via site.pp or nodes.pp
```
node 'example.example.net' {
include cd_puppetdb
include cd_nagios
}
```
#### through Foreman:

2
doc/file.README.html
View File

@@ -247,7 +247,7 @@ concat</a> to concatenate configuration files from different sources.</p>
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_puppetdb
include cd_nagios
}</code></pre>
<h4 id="label-through+Foreman%3A">through Foreman:</h4>

2
doc/index.html
View File

@@ -247,7 +247,7 @@ concat</a> to concatenate configuration files from different sources.</p>
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_puppetdb
include cd_nagios
}</code></pre>
<h4 id="label-through+Foreman%3A">through Foreman:</h4>