Merge branch 'master' of github.com:apereo/cas

# Conflicts: # docs/cas-server-documentation/developer/Maintenance-Policy.md
apereo · Sep 13, 2024 · 8498300 · 8498300
2 parents e5ec8b2 + b09a2a8
commit 8498300
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/cas-server-documentation/developer/Maintenance-Policy.md b/docs/cas-server-documentation/developer/Maintenance-Policy.md
@@ -67,7 +67,7 @@ The following CAS releases will transition into a security-patch mode (SPM) only
 | Release | SPM Starting Date  |             Full EOL |
 |---------|:------------------:|---------------------:|
 | `7.1.x` |  March 31st, 2025  | September 30th, 2025 |
-| `7.0.x` | October 31st, 2024 |  December 31st, 2024 |
+| `7.0.x` | October 31st, 2024 |  April 30th, 2025 |
 
 All previous releases absent in the above table are considered EOLed.
 

diff --git a/etc/loadtests/locust/requirements.txt b/etc/loadtests/locust/requirements.txt
@@ -15,4 +15,4 @@ six==1.16.0
 setuptools==74.1.2
 requests==2.32.3
 Werkzeug==3.0.4
-urllib3==2.2.2
+urllib3==2.2.3