-
Rucha Deshpande authored
commit 80a20ce6 Author: Rucha Deshpande <deshruch@amazon.com> Date: Wed Mar 31 2021 10:17:53 GMT-0500 (Central Daylight Time) merge with dev commit 5716e57f Author: Rucha Deshpande <deshruch@amazon.com> Date: Wed Mar 31 2021 10:16:29 GMT-0500 (Central Daylight Time) Merge remote-tracking branch 'remotes/origin/dev' into deshruch # Conflicts: # entitlements-v2-core/src/main/java/org/opengroup/osdu/entitlements/v2/auth/JwtClaimExtractor.java commit 4cfc8429 Author: Rucha Deshpande <deshruch@amazon.com> Date: Wed Mar 31 2021 10:16:14 GMT-0500 (Central Daylight Time) delete unwanted files commit 6fd37ed1 Author: Rucha Deshpande <deshruch@amazon.com> Date: Wed Mar 31 2021 09:51:05 GMT-0500 (Central Daylight Time) aws specific changes commit c0bff91c Author: Rucha Deshpande <deshruch@amazon.com> Date: Thu Mar 25 2021 14:04:56 GMT-0500 (Central Daylight Time) Add chmod perms to ssl for Windows commit 5dc5e9cb Author: Rucha Deshpande <deshruch@amazon.com> Date: Thu Mar 25 2021 10:03:05 GMT-0500 (Central Daylight Time) Add default for service domain commit 445e5aa4 Author: Rucha Deshpande <deshruch@amazon.com> Date: Thu Mar 25 2021 09:43:31 GMT-0500 (Central Daylight Time) Add AWS builspec
0dc9a6fc