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

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request 12ww1160/cd_apache!17
This commit is contained in:
Arne Teuke
2018-04-10 13:22:42 +02:00
parent 3a2477ad25 921eeddd76
commit f33df4d2b2
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CHANGELOG.md
View File

@@ -8,6 +8,26 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/62260e329bcf99e">62260e329bcf99e</a> Jenkins ConfDroid <i>2018-04-10 11:06:02</i>
<p>
<h3>recommit for updates in build 2</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/84ca8d72b971661">84ca8d72b971661</a> Arne Teuke <i>2018-04-10 11:05:24</i>
<p>
<h3>updates README</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/406a049bcef19c7">406a049bcef19c7</a> Jenkins ConfDroid <i>2018-04-10 10:56:53</i>
<p>
<h3>recommit for updates in build 1</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/5009ae57d917323">5009ae57d917323</a> Arne Teuke <i>2018-04-10 10:56:10</i>
<p>
<h3>added dev branch</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/692569d70082d85">692569d70082d85</a> Jenkins Server <i>2017-07-11 17:27:24</i>
<p>
<h3>recommit for updates in build 20</h3>

4
README.md
View File

@@ -24,7 +24,7 @@
* [Known Problems](#known-problems)
* [Support](#support)
* [Tests](#tests)
* [Changelog](https://gitlab.puppetsoft.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog)
* [Changelog](https://gitlab.confdroid.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog)
* [Contact Us](https://confdroid.com/contact/)
* [Disclaimer](#disclaimer)
@@ -61,7 +61,7 @@ Repostructure as been moved to REPOSTRUCTURE.md
### Dependencies
All dependencies must be included in the catalogue.
* [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources)
* [cd_resources](https://gitlab.confdroid.com/12WW1160/cd_resources)
### Deployment

4
doc/file.README.html
View File

@@ -113,7 +113,7 @@ production!!! __**</code></p>
<p><a href="#tests">Tests</a></p>
</li><li>
<p><a
href="https://gitlab.puppetsoft.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog">Changelog</a></p>
href="https://gitlab.confdroid.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog">Changelog</a></p>
</li><li>
<p><a href="https://confdroid.com/contact/">Contact Us</a></p>
</li><li>
@@ -174,7 +174,7 @@ gets installed automatically.</p>
<p>All dependencies must be included in the catalogue.</p>
<ul><li>
<p><a
href="https://gitlab.puppetsoft.com/12WW1160/cd_resources">cd_resources</a></p>
href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources</a></p>
</li></ul>
<h3 id="label-Deployment">Deployment</h3>

4
doc/index.html
View File

@@ -113,7 +113,7 @@ production!!! __**</code></p>
<p><a href="#tests">Tests</a></p>
</li><li>
<p><a
href="https://gitlab.puppetsoft.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog">Changelog</a></p>
href="https://gitlab.confdroid.com/12WW1160/cd_apache/blob/master/CHANGELOG.md#changelog">Changelog</a></p>
</li><li>
<p><a href="https://confdroid.com/contact/">Contact Us</a></p>
</li><li>
@@ -174,7 +174,7 @@ gets installed automatically.</p>
<p>All dependencies must be included in the catalogue.</p>
<ul><li>
<p><a
href="https://gitlab.puppetsoft.com/12WW1160/cd_resources">cd_resources</a></p>
href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources</a></p>
</li></ul>
<h3 id="label-Deployment">Deployment</h3>