Commit Graph

272 Commits

Author SHA1 Message Date
6b3bd0eecc Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 16:26:53 +02:00
Arne Teuke
12f835aa4f added and linked base contactgroups 2017-07-26 15:27:16 +01:00
Arne Teuke
6094321d4f sorted deprecated syntax 2017-07-26 14:04:39 +01:00
12ww1160
428abe511c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !56
2017-07-26 15:00:04 +02:00
af34a0587d recommit for updates in build 104 2017-07-26 15:05:02 +02:00
016dd178e6 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 15:04:14 +02:00
Arne Teuke
6ee49a5e33 fixed typo 2017-07-26 13:47:45 +01:00
Arne Teuke
6955770373 fixed typo 2017-07-26 13:40:23 +01:00
12ww1160
1cc679595d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !55
2017-07-26 14:38:52 +02:00
4dd15fea28 recommit for updates in build 103 2017-07-26 14:48:06 +02:00
572e8ba3c1 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 14:47:18 +02:00
Arne Teuke
8fafc260c8 finalizing contacts 2017-07-26 13:36:14 +01:00
Arne Teuke
04c206f448 finalizing contacts 2017-07-26 13:34:50 +01:00
12ww1160
fed9391fb2 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !54
2017-07-26 14:30:57 +02:00
19d33cb8a5 recommit for updates in build 102 2017-07-26 14:40:46 +02:00
c31082ab50 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 14:39:58 +02:00
12ww1160
12fd85cddc Merge branch 'jenkins' into 'master'
Jenkins

See merge request !53
2017-07-26 14:26:27 +02:00
5a33b87c5a recommit for updates in build 101 2017-07-26 14:36:37 +02:00
1b162fb4ea Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 14:35:48 +02:00
12ww1160
070dc41e42 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !52
2017-07-26 14:16:21 +02:00
039523e1f6 recommit for updates in build 99 2017-07-26 13:30:54 +02:00
Arne Teuke
a99920d788 linting 2017-07-26 12:30:34 +01:00
a42ae740bb Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 13:30:06 +02:00
Arne Teuke
1ed1db6e8f linting 2017-07-26 12:26:16 +01:00
Arne Teuke
2e52ec411c added base contacts and additional contacts 2017-07-26 12:24:31 +01:00
Arne Teuke
85ade68820 added base contacts and additional contacts 2017-07-26 12:16:25 +01:00
12ww1160
1eb3b2d734 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !51
2017-07-26 13:06:44 +02:00
d395b5f60d recommit for updates in build 97 2017-07-26 13:16:49 +02:00
223ca945a2 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 13:16:00 +02:00
Arne Teuke
099828e47a testing templates 2017-07-25 19:02:29 +01:00
Arne Teuke
336e03f609 testing templates 2017-07-25 19:01:03 +01:00
Arne Teuke
a04f079a6c testing templates 2017-07-25 18:56:18 +01:00
12ww1160
91df6d463c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !50
2017-07-25 19:54:21 +02:00
62feddee64 recommit for updates in build 96 2017-07-25 20:04:08 +02:00
7876ce5527 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 20:03:24 +02:00
12ww1160
95cf5c84bd Merge branch 'jenkins' into 'master'
Jenkins

See merge request !49
2017-07-25 19:47:28 +02:00
a23722a67a recommit for updates in build 93 2017-07-25 19:56:39 +02:00
5ed04d8e4c Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 19:55:56 +02:00
Arne Teuke
b4e4ceb9b0 added parameter documentation 2017-07-25 17:15:21 +01:00
Arne Teuke
e03a5d9475 added parameter documentation 2017-07-25 17:13:25 +01:00
12ww1160
5d2565e1f0 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !48
2017-07-25 18:05:47 +02:00
445db500b3 recommit for updates in build 92 2017-07-25 18:15:39 +02:00
33dd4d53b6 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 18:14:56 +02:00
12ww1160
6f56271fdc Merge branch 'jenkins' into 'master'
Jenkins

See merge request !47
2017-07-25 18:04:29 +02:00
a3517b81e6 recommit for updates in build 91 2017-07-25 18:13:43 +02:00
8432bc5784 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 18:13:01 +02:00
Arne Teuke
6a57847a12 added contact stanza 2017-07-25 16:57:10 +01:00
12ww1160
9914a5e0f6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !46
2017-07-25 17:47:31 +02:00
cc2d2cbf29 recommit for updates in build 90 2017-07-25 17:57:28 +02:00
c80477007a Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 17:56:45 +02:00