diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2023-05-16 19:41:15 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2023-05-16 19:41:15 +0400 |
| commit | d6da296f04d5532d62a123f434f615d26c2335a1 (patch) | |
| tree | 959e5e3d7793aba0327b84c0f14633e9cb136942 | |
| parent | 57035b9f2076d51e5dde9c09077441c34781375d (diff) | |
| download | rabbitmq-server-git-d6da296f04d5532d62a123f434f615d26c2335a1.tar.gz | |
Resolve a conflict (#8216)
| -rw-r--r-- | deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema b/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema index cd4fbfeeca..8ee313ba5e 100644 --- a/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema +++ b/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema @@ -5,15 +5,11 @@ %% %% ---------------------------------------------------------------------------- -<<<<<<< HEAD -%% A prefix used for scopes in UAA to avoid scope collisions (or unintended overlap). It is an empty string by default. -======= %% OAuth Resource identity. Usage: %% - This is the identity of a RabbitMQ server/cluster used as the %% recipient of JWT Tokens (see audience claim, https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3). %% - This is also the resource identifier used by RabbitMQ server/cluster in the authorization and access token %% requests (https://datatracker.ietf.org/doc/html/draft-ietf-oauth-resource-indicators-05#page-3) ->>>>>>> 0131e9900f (Configure Oauth scope prefix) %% %% Up to version 3.12, RabbitMQ's scopes followed this pattern : <resource_server_id>.<scope>. %% Nowadays, there is a new setting called scope_prefix and RabbitMQ's scopes follow this pattern instead: |