From e0c959a7bdd9408da7f8551a47a4b7f8bb1d40c5 Mon Sep 17 00:00:00 2001
From: Kurt Garloff <kurt@garloff.de>
Date: Thu, 28 May 2026 23:31:10 +0200
Subject: [PATCH 1/2] Add Johannes (meyerjom).

Also move noris just below wavecon, we may merge the groups at some
point.

Signed-off-by: Kurt Garloff <kurt@garloff.de>
---
 orgs/SovereignCloudStack/data.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/orgs/SovereignCloudStack/data.yaml b/orgs/SovereignCloudStack/data.yaml
index 65712b9..00924e4 100644
--- a/orgs/SovereignCloudStack/data.yaml
+++ b/orgs/SovereignCloudStack/data.yaml
@@ -197,6 +197,8 @@ members:
     login: curx
   - name: Benedikt Haug
     login: benedikt-haug
+  - name: Johannes Meyer
+    login: meyerjom
 
 # ==========================
 teams:
@@ -301,6 +303,14 @@ teams:
       - cedegi
       - chschilling
       - matfechner
+  - slug: "noris"
+    description: "noris network AG"
+    privacy: closed
+    maintainer:
+      []
+    member:
+      - benedikt-haug
+      - meyerjom
   - slug: "dnation"
     description: "dNation"
     privacy: closed
@@ -325,13 +335,6 @@ teams:
       - garloff
     member:
       []
-  - slug: "noris"
-    description: "noris network AG"
-    privacy: closed
-    maintainer:
-      []
-    member:
-      - benedikt-haug
   - slug: "hardware-landscape"
     description: "The team which manages the scs system landscape or needs information about it"
     privacy: closed

From 7161600d6395cb5b2d6cdbe4daa1aa1923e7fee5 Mon Sep 17 00:00:00 2001
From: Felix Kronlage-Dammers <fkr@hazardous.org>
Date: Thu, 4 Jun 2026 09:56:22 +0200
Subject: [PATCH 2/2] merge users into noris and remove wavecon

discussed with @garloff

Signed-off-by: Felix Kronlage-Dammers <fkr@hazardous.org>
---
 orgs/SovereignCloudStack/data.yaml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/orgs/SovereignCloudStack/data.yaml b/orgs/SovereignCloudStack/data.yaml
index 00924e4..bda9e3b 100644
--- a/orgs/SovereignCloudStack/data.yaml
+++ b/orgs/SovereignCloudStack/data.yaml
@@ -293,16 +293,6 @@ teams:
     member:
       - fzakfeld
       - mojansch
-  - slug: "wavecon"
-    description: "Wavecon GmbH"
-    privacy: closed
-    maintainer:
-      - jnull
-    member:
-      - linwalth
-      - cedegi
-      - chschilling
-      - matfechner
   - slug: "noris"
     description: "noris network AG"
     privacy: closed
@@ -311,6 +301,11 @@ teams:
     member:
       - benedikt-haug
       - meyerjom
+      - jnull
+      - linwalth
+      - cedegi
+      - chschilling
+      - matfechner
   - slug: "dnation"
     description: "dNation"
     privacy: closed