Commit Graph

80 Commits

Author SHA1 Message Date
Arne Teuke
84ca8d72b9 updates README 2018-04-10 13:05:24 +02:00
Arne Teuke
5009ae57d9 added dev branch 2018-04-10 12:56:10 +02:00
12ww1160
355409a1c9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !14
2017-07-11 19:20:12 +02:00
692569d700 recommit for updates in build 20 2017-07-11 19:27:24 +02:00
7ffd5ccb81 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:26:59 +02:00
Arne Teuke
4296733d3e more improved testing 2017-07-11 18:26:50 +01:00
Arne Teuke
387ab193a9 more improved testing 2017-07-11 18:24:39 +01:00
Arne Teuke
eacdc6522b updated README 2017-07-11 18:14:21 +01:00
Arne Teuke
08da1c5e70 finalised this stage 2017-07-11 18:12:23 +01:00
Arne Teuke
19a1a86f2a finalised this stage 2017-07-11 18:06:45 +01:00
12ww1160
d9a2c491f1 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !13
2017-07-11 19:05:30 +02:00
5556fd1ec6 recommit for updates in build 17 2017-07-11 19:12:52 +02:00
0c3938b583 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:12:29 +02:00
12ww1160
9589be79c6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !12
2017-07-11 19:01:30 +02:00
c1963582f0 recommit for updates in build 16 2017-07-11 19:08:47 +02:00
eaf17e5f1e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 19:08:24 +02:00
Arne Teuke
8345322978 added one more step 2017-07-11 18:01:19 +01:00
12ww1160
6a67c02f3c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !11
2017-07-11 18:59:27 +02:00
f1988c6272 recommit for updates in build 14 2017-07-11 19:01:52 +02:00
Arne Teuke
114dd0f0b5 removed stale FileList 2017-07-11 17:57:22 +01:00
Arne Teuke
7ba28eca8e updated README and version 2017-07-11 17:56:04 +01:00
12ww1160
1183def439 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !10
2017-07-11 18:46:16 +02:00
3764f0bef1 recommit for updates in build 12 2017-07-11 18:53:37 +02:00
89ffb153dc Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 18:53:13 +02:00
Arne Teuke
c9a26ad054 enhanced test to keep a permanent list of UTF files in tests/UTF_Files 2017-07-11 17:53:03 +01:00
Arne Teuke
9b646162ae added new Jenkins test to check for unwanted UTF8 files 2017-07-11 17:31:45 +01:00
12ww1160
6ae6ad8f57 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !9
2017-07-11 18:25:32 +02:00
a1b2032baa recommit for updates in build 11 2017-07-11 18:32:16 +02:00
7270cd3704 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-11 18:31:52 +02:00
Arne Teuke
df0edc483d converted LICENSE to ASCII 2017-07-10 18:59:32 +01:00
12ww1160
38f4b62ff6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !8
2017-07-10 19:53:48 +02:00
c380f8f996 recommit for updates in build 10 2017-07-10 20:00:02 +02:00
e28fdc10ca Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-10 19:59:43 +02:00
Arne Teuke
ed7589fbfa removed sites and simply added the examples 2017-07-09 16:23:38 +01:00
Arne Teuke
fefd3a57ab removed sites and simply added the examples 2017-07-09 16:22:04 +01:00
Arne Teuke
0768054b48 added vhost examples 2017-07-09 16:20:05 +01:00
Arne Teuke
7ac9b40730 added vhost examples 2017-07-09 16:18:26 +01:00
12ww1160
77dbf09b60 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !7
2017-07-09 17:18:00 +02:00
ed5ca1113e recommit for updates in build 9 2017-07-09 17:24:08 +02:00
Arne Teuke
ef4e41395b updated README with vhost details and updated version 2017-07-09 16:15:32 +01:00
Arne Teuke
ce399480a4 updated README 2017-07-09 16:08:26 +01:00
12ww1160
84692e42e9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !6
2017-07-07 18:34:54 +02:00
36dc5918e5 recommit for updates in build 4 2017-07-07 18:41:30 +02:00
a939721549 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_apache into HEAD 2017-07-07 18:41:12 +02:00
Arne Teuke
3715b3a582 updated README 2017-07-07 17:40:31 +01:00
Arne Teuke
a88ed09f42 updated README 2017-07-07 17:38:00 +01:00
12ww1160
1697dadac7 Merge branch 'jenkins' into 'master'
Jenkins Merger

See merge request !5
2017-07-07 18:32:22 +02:00
871d6e65ba recommit for updates in build 3 2017-07-07 18:38:35 +02:00
12ww1160
dc9fbf86ea Merge branch 'jenkins' into 'master'
Jenkins Merge

See merge request !4
2017-07-07 17:16:00 +02:00
e13154f011 recommit for updates in build 2 2017-07-07 17:22:20 +02:00