mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-16 23:41:43 +00:00
Resolve conflicts from staging advancing with the MCP tools/list span work (#31525) and the key permissions admin-gate (#31810): - otel logger.py: keep the PR's multi-span (carrier.spans / emit_fanout) fan-out, adopt staging's _seed_identity_baggage helper in the deferred path - context.py: union ContextVar+Token and TYPE_CHECKING+Mapping imports - key_management_endpoints.py: hoist the regenerate team lookup to the top so both staging's object_permission gate and the PR's logging_exporters gate see it - tests: union the new imports/mocks and keep both sides' added tests |
||
|---|---|---|
| .. | ||
| litellm-dashboard | ||
| Dockerfile | ||
| nginx.conf | ||