Commit Graph

13 Commits

Author SHA1 Message Date
12ww1160
ae88116c3e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !3
2017-07-20 16:38:54 +02:00
84a42a16a3 recommit for updates in build 4 2017-07-20 16:46:15 +02:00
dc39ed077e Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 16:45:40 +02:00
Arne Teuke
4c9cff0e73 added check for nagios_server to access 2017-07-20 15:45:54 +01:00
Arne Teuke
8a14684ca2 changed creates rule for exec 2017-07-20 15:10:54 +01:00
Arne Teuke
cb2010e7d2 moved service dependency to access_rules 2017-07-20 15:09:11 +01:00
12ww1160
4f7ca0ad36 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !2
2017-07-20 16:02:17 +02:00
030e5f68f5 recommit for updates in build 3 2017-07-20 16:11:13 +02:00
22bbfac4ca Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-20 16:10:39 +02:00
Arne Teuke
febc8f1a34 re-added all files 2017-07-20 14:47:24 +01:00
12ww1160
4c441a8e1f Merge branch 'jenkins' into 'master'
Jenkins

See merge request !1
2017-07-20 15:41:28 +02:00
3a3e3ceef9 recommit for updates in build 2 2017-07-20 15:47:46 +02:00
Arne Teuke
8db8758970 recommitting to see if git can be fixed 2017-07-20 14:31:19 +01:00