Skip to content

Commit 9e6c8ec

Browse files
authored
Merge branch 'main' into dependabot/pip/pip-67a51a1997
2 parents d15935d + fbb2733 commit 9e6c8ec

File tree

5 files changed

+59
-5
lines changed

5 files changed

+59
-5
lines changed

orgs/SovereignCloudStack/data.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ members:
215215
login: Till769
216216
- name: Eike Waldt
217217
login: yeoldegrove
218-
- name: Tilman Luetje
218+
- name: Tilman Luettje
219219
login: b1-luettje
220220
- name: Jan-Marten Brüggemann
221221
login: brueggemann
@@ -264,6 +264,10 @@ members:
264264
login: kitsudaiki
265265
- name: Marius Quabeck
266266
login: MariusQuabeck
267+
- name: Lukas Kraus
268+
login: cpt-kernel-afk
269+
- name: Jan Horstmann
270+
login: janhorstmann
267271

268272
# ==========================
269273
teams:
@@ -379,6 +383,7 @@ teams:
379383
- gndrmnn
380384
- lindenb1
381385
- sbstnnmnn
386+
- janhorstmann
382387
- slug: "plusserver"
383388
description: "plusserver GmbH"
384389
privacy: closed
@@ -617,6 +622,7 @@ teams:
617622
maintainer:
618623
- scoopex
619624
- fkr
625+
- fzakfeld
620626
member:
621627
- berendt
622628
- zuse-z3
@@ -626,11 +632,9 @@ teams:
626632
maintainer:
627633
- jschoone
628634
member:
629-
- bitkeks
630635
- fkr
631636
- garloff
632637
- scoopex
633-
- joshmue
634638
- slug: "zendis"
635639
description: "Colleagues from Zendis"
636640
privacy: closed
@@ -656,6 +660,11 @@ teams:
656660
maintainer:
657661
- Adri2000
658662
member: []
663+
- slug: "rrze-fau"
664+
description: "Colleagues from RRZE / FAU"
665+
privacy: closed
666+
maintainer:
667+
- cpt-kernel-afk
659668

660669
# ==========================
661670
branch_protection_templates:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
cephadm-rookify-testsetup:
3+
default_branch: main
4+
description: 'Test the rookification of Cephadm with Rookify'
5+
homepage: 'https://scs.community/'
6+
topics:
7+
- ceph
8+
- k8s
9+
- rookify
10+
archived: false
11+
has_issues: true
12+
has_projects: false
13+
has_wiki: true
14+
private: false
15+
delete_branch_on_merge: true
16+
allow_merge_commit: false
17+
allow_squash_merge: true
18+
allow_rebase_merge: true
19+
teams:
20+
- slug: "VP03"
21+
permission: "admin"
22+
collaborators: []
23+
branch_protections:
24+
- branch: "main"
25+
template: "main"

orgs/SovereignCloudStack/repositories/hardware-landscape.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ hardware-landscape:
2020
collaborators: []
2121
branch_protections:
2222
- branch: "main"
23-
template: "main"
23+
template: "owner_bypass"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
openstack-csp-helper:
3+
default_branch: main
4+
description: Helper chart for using openstack cluster-stacks
5+
topics:
6+
- k8s
7+
archived: false
8+
has_issues: true
9+
has_projects: false
10+
has_wiki: false
11+
private: false
12+
delete_branch_on_merge: true
13+
allow_merge_commit: false
14+
allow_squash_merge: true
15+
allow_rebase_merge: true
16+
teams: []
17+
collaborators: []
18+
branch_protections:
19+
- branch: "main"
20+
template: "main"

orgs/SovereignCloudStack/repositories/openstack-workload-generator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ openstack-workload-generator:
2323
collaborators: []
2424
branch_protections:
2525
- branch: "main"
26-
template: "main"
26+
template: "owner_bypass"

0 commit comments

Comments
 (0)