Skip to content
Snippets Groups Projects
Commit 94ed83bb authored by Spencer Sutton's avatar Spencer Sutton
Browse files

Entitlements V2

commit 61d71408 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu May 06 2021 08:45:41 GMT-0500 (Central Daylight Time) 

    Merge remote-tracking branch 'remotes/origin/dev' into ent-v2


commit 8989d6a7 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Thu May 06 2021 08:45:00 GMT-0500 (Central Daylight Time) 

    ent v2


commit e597bde3 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed May 05 2021 15:13:09 GMT-0500 (Central Daylight Time) 

    Merge remote-tracking branch 'remotes/origin/dev' into ent-v2

# Conflicts:
#	provider/legal-aws/src/main/resources/application.properties


commit 12444b7b 
Author: Rucha Deshpande <deshruch@amazon.com> 
Date: Wed May 05 2021 11:39:23 GMT-0500 (Central Daylight Time) 

    use Entitlements V2
parent 530ad732
No related branches found
No related tags found
1 merge request!113Multi-tenancy
......@@ -13,7 +13,7 @@ aws.resourcePrefix=${ENVIRONMENT}
aws.region=${AWS_REGION}
REGION=${AWS_REGION}
AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v1
AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
PARTITION_API=${ENTITLEMENTS_BASE_URL}/api/partition/v1
LEGAL_HOSTNAME=notused
CRON_JOB_IP=10.0.0.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment