Skip to content

Cherry pick: Merge branch 'aws-integration' into 'release/0.16'

Chad Leong requested to merge cherry-pick-2541e613 into release/0.16

upgrade spring-webmvc

See merge request !266 (merged)

(cherry picked from commit 2541e613)

d4c4ba0e Merge branch 'master' into master-dev-merge fa8924d2 resolve merge conflict 5d21e125 merge changes 49ebc189 merge changes f3800b0d Squashed commit of the following b663c3d1 fix merge conflicts d0d16fe7 chnages for E2E testing bcbfc962 Postman error update fe95b406 updated pipeline to ref master 2f393a37 Squashed commit of the following 4804efd0 Merge branch 'master' into master-dev-merge 4bac1bd8 Merge remote-tracking branch 'origin/master' into... 64bb785a Resolve merge conflicts 7dcd9d95 Resolve conflicts b0bc6094 Merge branch 'master' into master-dev-merge 5e0c8027 Squashed commit of the following 7bc11da2 Squashed commit of the following: b7f94a9e Merge remote-tracking branch 'origin/master' into... 24fa77e1 Merge branch 'master' into master-dev-merge 6f8ef546 spring-webmvc upgrade 28f83894 resolve conflicts e54124fe Update .gitlab-ci.yml 73127d15 Merge branch 'master' into aws-integration 8f18729d Merge branch 'master' into aws-integration f4f122b3 gcp upgrade spring-mvc

Merge request reports