3
0
Commit Graph

56 Commits

Author SHA1 Message Date
e56129baa9 Recommit for updates in build 15 2025-10-18 12:35:37 +02:00
7edd5cf2e6 Merge remote-tracking branch 'origin/master' into jenkins-build-15 2025-10-18 12:34:52 +02:00
Arne Teuke
c2eca38b93 add fw and dirs control - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 12:30:47 +02:00
87c6b84b1e Merge branch 'jenkins-build-14' into 'master'
Auto-merge for build 14

See merge request puppet/prometheus_cd!13
2025-10-18 09:35:40 +00:00
e21d723240 Recommit for updates in build 14 2025-10-18 11:28:07 +02:00
61e0d83c08 Merge remote-tracking branch 'origin/master' into jenkins-build-14 2025-10-18 11:27:26 +02:00
Arne Teuke
42befb46c3 edit yumrepo - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 11:26:47 +02:00
4a9ebcbed2 Merge branch 'jenkins-build-13' into 'master'
Auto-merge for build 13

See merge request puppet/prometheus_cd!12
2025-10-18 09:13:17 +00:00
97929199e7 Recommit for updates in build 13 2025-10-18 11:11:31 +02:00
2046f1562a Merge remote-tracking branch 'origin/master' into jenkins-build-13 2025-10-18 11:10:51 +02:00
Arne Teuke
54173a3f83 edit yumrepo - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 11:10:02 +02:00
b03563bb9c Merge branch 'jenkins-build-12' into 'master'
Auto-merge for build 12

See merge request puppet/prometheus_cd!11
2025-10-18 09:08:21 +00:00
abb80600de Merge branch 'jenkins-build-11' into 'master'
Auto-merge for build 11

See merge request puppet/prometheus_cd!10
2025-10-18 09:08:10 +00:00
d67114f906 Recommit for updates in build 12 2025-10-18 10:55:43 +02:00
c4ee920529 Merge remote-tracking branch 'origin/master' into jenkins-build-12 2025-10-18 10:55:01 +02:00
Arne Teuke
d76c6673f2 edit packages - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 10:54:17 +02:00
92c5dcffb1 Recommit for updates in build 11 2025-10-18 10:53:07 +02:00
e8ea05c8e1 Merge remote-tracking branch 'origin/master' into jenkins-build-11 2025-10-18 10:52:23 +02:00
Arne Teuke
5153f01f5b edit yumrepo - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-18 10:51:44 +02:00
c80dd19c80 Merge branch 'jenkins-build-10' into 'master'
Auto-merge for build 10

See merge request puppet/prometheus_cd!9
2025-10-17 15:26:24 +00:00
9bdc76983d Recommit for updates in build 10 2025-10-17 17:25:18 +02:00
07426ceb46 Merge remote-tracking branch 'origin/master' into jenkins-build-10 2025-10-17 17:24:32 +02:00
Arne Teuke
d041e0be45 fix params - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/260 2025-10-17 17:21:26 +02:00
abc15ce0d6 Merge branch 'jenkins-build-9' into 'master'
Auto-merge for build 9

See merge request puppet/prometheus_cd!8
2025-06-13 13:51:10 +00:00
67164ea9d1 Recommit for updates in build 9 2025-06-13 15:49:08 +02:00
66fc50845c Merge remote-tracking branch 'origin/master' into jenkins-build-9 2025-06-13 15:48:31 +02:00
Arne Teuke
1551da1358 add services 2025-06-13 15:48:12 +02:00
409fc1763e Merge branch 'jenkins-build-8' into 'master'
Auto-merge for build 8

See merge request puppet/prometheus_cd!7
2025-06-13 13:44:30 +00:00
9857c6195d Recommit for updates in build 8 2025-06-13 15:43:23 +02:00
16e474fd17 Merge remote-tracking branch 'origin/master' into jenkins-build-8 2025-06-13 15:42:46 +02:00
Arne Teuke
304823319c add services 2025-06-13 15:42:26 +02:00
fecfa85221 Merge branch 'jenkins-build-7' into 'master'
Auto-merge for build 7

See merge request puppet/prometheus_cd!6
2025-06-13 13:36:16 +00:00
4cd58536d8 Recommit for updates in build 7 2025-06-13 15:34:47 +02:00
58b362d4b4 Merge remote-tracking branch 'origin/master' into jenkins-build-7 2025-06-13 15:34:11 +02:00
Arne Teuke
5aab4c8bb1 add installation and update Readme 2025-06-13 15:33:52 +02:00
0185a11f09 Merge branch 'jenkins-build-6' into 'master'
Auto-merge for build 6

See merge request puppet/prometheus_cd!5
2025-06-13 13:29:52 +00:00
d3f3f286b0 Recommit for updates in build 6 2025-06-13 15:27:42 +02:00
8aba4c52b0 Merge remote-tracking branch 'origin/master' into jenkins-build-6 2025-06-13 15:27:06 +02:00
Arne Teuke
51104edd2c add installation and update Readme 2025-06-13 15:26:50 +02:00
0443e120f2 Merge branch 'jenkins-build-5' into 'master'
Auto-merge for build 5

See merge request puppet/prometheus_cd!4
2025-06-13 13:14:56 +00:00
1b9d2e6f88 Recommit for updates in build 5 2025-06-13 15:14:43 +02:00
9f7e3ccd8c Merge remote-tracking branch 'origin/master' into jenkins-build-5 2025-06-13 15:14:06 +02:00
Arne Teuke
c830889e8e update yumrepo 2025-06-13 15:13:46 +02:00
eef492a631 Merge branch 'jenkins-build-4' into 'master'
Auto-merge for build 4

See merge request puppet/prometheus_cd!3
2025-06-13 13:09:53 +00:00
59172e9611 Recommit for updates in build 4 2025-06-13 15:06:02 +02:00
f4612fa7fb Merge remote-tracking branch 'origin/master' into jenkins-build-4 2025-06-13 15:05:26 +02:00
Arne Teuke
424f279849 add yumrepo 2025-06-13 15:05:10 +02:00
12ww1160
1fad3f36ea Merge branch 'jenkins-build-3' into 'master'
Auto-merge for build 3

See merge request puppet/prometheus_cd!2
2025-06-13 12:51:13 +00:00
12ww1160
54bc557ab3 Merge branch 'master' into 'jenkins-build-3'
# Conflicts:
#   doc/_index.html
#   doc/puppet_class_list.html
#   doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Aconfig.html
#   doc/puppet_classes/prometheus_cd_3A_3Aparams.html
2025-06-13 12:50:45 +00:00
2ac8e361c1 Merge branch 'jenkins-build-2' into 'master'
Auto-merge for build 2

See merge request puppet/prometheus_cd!1
2025-06-13 12:49:31 +00:00