Merge branch 'main' into add-joeeltgroth

org/cloudfoundry.yml

@@ -60,6 +60,11 @@ orgs:
         description: Infrastructure as Code for the App Runtime Interfaces Working Group
         has_projects: true
         default_branch: main
+      app-runtime-platform-envs:
+        default_branch: main
+        description: bbl state files for App Runtime Platform Working Group environments
+        has_projects: false
+        private: true
       apt-buildpack:
         has_projects: false
         has_wiki: false

org/contributors.yml

@@ -7,7 +7,6 @@ contributors:
 - acrmp
 - aditya267vmware
 - adrianhoelzl-sap
-- akrishna90
 - ameowlia
 - anoopjb
 - anshrupani
@@ -42,7 +41,6 @@ contributors:
 - cf-rabbit-bot
 - cf-release-notes-bot
 - chaitanyamullangi
-- clintyoshimura
 - colins
 - coolgang123
 - crhntr
@@ -65,7 +63,6 @@ contributors:
 - duanemay
 - dubeyshefali
 - ebroberson
-- eirinici
 - emalm
 - emmjohnson
 - evanfarrar
@@ -94,7 +91,6 @@ contributors:
 - jbooherl
 - jericop
 - jhvhs
-- jimconner
 - jintusebastian
 - jmervinnirma
 - joaopapereira
@@ -126,7 +122,6 @@ contributors:
 - m-thavaf
 - MarcPaquette
 - mariash
-- matt-royal
 - max-soe
 - MerricdeLauney
 - metric-store-ci
@@ -142,7 +137,6 @@ contributors:
 - nader-ziada
 - nakulogale-cb
 - nand2
-- nebhale
 - norman-abramovitz
 - nouseforaname
 - ohkyle
@@ -164,7 +158,6 @@ contributors:
 - pyogesh2
 - radhavmwtnz
 - radito3
-- radoslav-tomov
 - ragaskar
 - rajathagasthya
 - ramonskie
@@ -180,7 +173,6 @@ contributors:
 - salzmannsusan
 - samze
 - Sascha-Stoj
-- sboyajyan
 - selzoc
 - services-api-ci
 - servicesenablement
@@ -233,3 +225,4 @@ contributors:
 - zucchinidev
 - nookala
 - joeeltgroth
+- jajita

toc/rfc/rfc-0027-generic-per-route-features.md

@@ -56,7 +56,7 @@ applications:
   routes:
   - route: example.com
     options:
-      loadbalancing-algorithm: round-robin
+      loadbalancing: round-robin
       connection-limit: 15
       session-cookie: FOOBAR
       trim-path: true
@@ -124,7 +124,7 @@ not final):
     "some_key": "some_value"
   },
   "options": {
-    "lb-algo": "least-conn",
+    "loadbalancing": "least-conn",
     "conn-limit": 100,
     "cookie": "my-session-cookie",
     "trim-path": true