Commit graph

1 commit

Author SHA1 Message Date
Yucheng He
2e4f04dcc1 Merge remote-tracking branch 'origin/main' into litellm_fips_aes_gcm_default
# Conflicts:
#	docker/Dockerfile.non_root
#	litellm/proxy/common_utils/encrypt_decrypt_utils.py
#	litellm/proxy/management_endpoints/credential_migration.py
#	tests/integration/_support/process.py
#	tests/unit/proxy/common_utils/test_encrypt_decrypt_utils.py
#	tests/unit/proxy/common_utils/test_fips.py
#	tests/unit/proxy/proxy_server/test_proxy_config.py
#	uv.lock
2026-10-05 01:09:38 -07:00