Merge branch 'main' into gsoc-2024-proporsal

README.md

@@ -50,7 +50,7 @@ Keptn Community - APAC/EMEA |Every Other Wednesday at 10:00 AM CET|[Google Doc](
 Keptn Community - US/EMEA |Every Other Wednesday at 10:30 AM ET (9:30 AM CT / 4:30 PM CET) |[Google Doc](https://docs.google.com/document/d/1y7a6uaN8fwFJ7IRnvtxSfgz-OGFq6u7bKN6F7NDxKPg/edit)|[Zoom](https://zoom.us/j/91225371301?pwd=T2ZjRDN4Z215MHQwSWh2cXJKT3l0dz09)
 Keptn New Contributors Meeting |Every 2nd Monday per Month at 10:30 AM ET (4:30 PM CET) |[Google Doc](https://docs.google.com/document/d/1rTwjhzoNiWRvNk7LdcADI50Kon9uTT8PtYPmYjiE_sQ) |[Zoom](https://zoom.us/j/94620164884?pwd=cndlRTY4RGRTcWRnQTlzTWtmYi9xQT09)
 
-All meetings are also on the public calendar: [Calendar](https://calendar.google.com/calendar/u/0/embed?src=dynatrace.com_abjrh1ukf18ih477tb1ekag2ag@group.calendar.google.com&pli=1)
+All meetings are listed in the [CNCF Keptn Community Chapter](https://community.cncf.io/keptn-community/) as well as the public [Keptn Google Calendar](https://calendar.google.com/calendar/u/0/r?cid=ZHluYXRyYWNlLmNvbV9hYmpyaDF1a2YxOGloNDc3dGIxZWthZzJhZ0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t)
 
 ## Contributing
 

config/keptn/org.yaml

@@ -12,7 +12,8 @@ members_can_create_repositories: false
 admins:
   # governance committee
   - AnaMMedina21
-  - AloisReitbauer
+  - salaboy
+  - thschue
   # CNCF
   - thelinuxfoundation
   - caniszczyk
@@ -30,11 +31,13 @@ members:
   - agardnerIT
   - agrimmer
   - alipatton10
+  - AloisReitbauer
   - arthurpitman
   - bacherfl
   - bradmccoydev
   - checkelmann
   - christian-kreuzberger-dtx
+  - eddycharly
   - ermin-muratovic
   - eysk-io
   - grabnerandi
@@ -69,7 +72,6 @@ members:
   - TannerGabriel
   - TannerGilbert
   - telltale00
-  - thschue
   - vadasambar
   - warber
   - YashPimple
@@ -84,6 +86,7 @@ teams:
   emeriti:
     members:
       - thschue
+      - AloisReitbauer
 
   admins:
     members:
@@ -108,8 +111,9 @@ teams:
 
   governance-committee:
     members:
-      - AloisReitbauer
       - AnaMMedina21
+      - salaboy
+      - thschue
     repos:
       community: admin
       enhancement-proposals: admin

governance/members-and-charter.md

@@ -1,6 +1,6 @@
 # Governance Charter
 
- Last update: July 2023
+ Last update: February 2024
 
  ## Overview
 
@@ -32,16 +32,8 @@
 
  ### Governance Committee Members
 
- The following Governance Committee's term goes from December 1st 2022 until November 30th 2023.
- You can find the election process detailed [here.](https://github.com/keptn/community/blob/main/elections/2022/governance-committee-election.md)
-
- ### Alois Reitbauer
-
- - Company: Dynatrace
- - GitHub: https://github.com/aloisreitbauer
- - Twitter: https://twitter.com/aloisreitbauer
-
- ---
+ The following Governance Committee's term goes from February 1st 2024 until January 31st 2025.
+ You can find the election process detailed [here.](https://github.com/keptn/community/blob/main/elections/2023/governance-committee-election.md)
 
  ### Ana Margarita Medina
 
@@ -50,14 +42,28 @@
  - Twitter [@Ana_M_Medina](https://twitter.com/Ana_M_Medina)
  - LinkedIn [Ana Margarita Medina](https://www.linkedin.com/in/anammedina/)
 
+ ### Mauricio Salatino
+
+ - Company: Diagrid
+ - GitHub: [Salaboy](https://github.com/salaboy)
+ - Twitter [@salaboy](https://twitter.com/salaboy)
+ - LinkedIn [Mauricio Salatino](https://www.linkedin.com/in/salaboy/)
+
+### Thomas Schuetz
+
+ - Company: WhizUs
+ - GitHub: [thschue](https://github.com/thschue)
+ - Twitter [@ThSchue](https://twitter.com/ThSchue)
+ - LinkedIn [Thomas Schuetz](https://www.linkedin.com/in/thschue/)
+
+
 
  ## Technical Committee (TC) 
 
  ### TC Members
 
  @thisthat
  @bradmccoydev 
- @thschue 
 
 
  ### TC Charter