# Conflicts:
#	devops/azure/chart/templates/deployment.yaml
#	devops/azure/pipeline.yml

Enhance and enable AuthenticationRequestFilter in AKS to enforce entitlements

See merge request !11

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/reference/crs-conversion-service into entitlement

# Conflicts:
#	.gitlab-ci.yml

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/reference/crs-conversion-service into up-master

Fix Spring Context for GCP (GONRG-950)

See merge request !10

Riabokon Stanislav(EPAM)[GCP] authored 4 years ago and Rostislav Dublin (EPAM) committed 4 years ago

Added new dependencies to fix spring app context for GAE and GKE.

Feat/aws impl

See merge request !9

Squashed commit of the following

commit a32cc57b
Author: Matt Wise <wsmatth@amazon.com>
Date: Mon Oct 05 2020 16:04:07 GMT-0500 (Central Daylight Time)

    Add copyright

commit 48979be5
Author: Matt Wise <wsmatth@amazon.com>
Date: Mon Oct 05 2020 16:03:12 GMT-0500 (Central Daylight Time)

    Add copyright

commit a6147449
Author: Matt Wise <wsmatth@amazon.com>
Date: Mon Oct 05 2020 14:20:54 GMT-0500 (Central Daylight Time)

    CI & Dockerfile fixes fro SIS Data Support

commit 7ee6d526
Author: Matt Wise <wsmatth@amazon.com>
Date: Mon Oct 05 2020 14:06:17 GMT-0500 (Central Daylight Time)

    fix int test invalid property

commit 2c354708
Author: Matt Wise <wsmatth@amazon.com>
Date: Fri Oct 02 2020 17:01:05 GMT-0500 (Central Daylight Time)

    auth implementation for aws

commit 327505e9
Author: Matt Wise <wsmatth@amazon.com>
Date: Fri Oct 02 2020 15:05:00 GMT-0500 (Central Daylight Time)

    ignore generated files

commit 3df36da0
Author: Matt Wise <wsmatth@amazon.com>
Date: Wed Sep 30 2020 17:13:24 GMT-0500 (Central Daylight Time)

    add relative path

commit 9f4ce575
Author: Matt Wise <wsmatth@amazon.com>
Date: Wed Sep 30 2020 15:12:42 GMT-0500 (Central Daylight Time)

    initial aws service implementation

Update fossa notice

See merge request !7

port aks pipeline to osdu

See merge request !6