Automated PR to merge changes from develop to release-v1.5.0
I failed to cherry-pick the changes automatically because of the following:
Auto-merging packages/commons/package.json
Auto-merging packages/commons/src/logger.ts
CONFLICT (content): Merge conflict in packages/commons/src/logger.ts
CONFLICT (rename/delete): packages/workflow/src/logger.ts renamed to packages/components/src/LoadingBar/index.ts in HEAD, but deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons).
CONFLICT (modify/delete): packages/components/src/LoadingBar/index.ts deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons) and modified in HEAD. Version HEAD of packages/components/src/LoadingBar/index.ts left in tree.
Auto-merging packages/config/src/config/database.ts
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
Auto-merging packages/config/src/handlers/forms/formsHandler.ts
CONFLICT (content): Merge conflict in packages/config/src/handlers/forms/formsHandler.ts
Auto-merging packages/config/src/server.ts
CONFLICT (content): Merge conflict in packages/config/src/server.ts
Auto-merging packages/gateway/src/features/OIDPUserInfo/utils.ts
Auto-merging packages/metrics/src/config/database.ts
Auto-merging packages/metrics/src/features/performance/viewRefresher.ts
Auto-merging packages/notification/src/database.ts
Auto-merging packages/search/src/elasticsearch/dbhelper.ts
CONFLICT (content): Merge conflict in packages/search/src/elasticsearch/dbhelper.ts
Auto-merging packages/user-mgnt/src/database.ts
Auto-merging packages/webhooks/src/database.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-utils.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/fhir/fhir-utils.ts
Auto-merging packages/workflow/src/features/registration/sms-notification-utils.ts
Auto-merging packages/workflow/src/features/registration/utils.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/utils.ts
Auto-merging packages/workflow/src/records/handler/download.ts
error: could not apply dc318cf4c... only use hapi-pino in production, consolidate different logging modules under commons
Automated PR to merge changes from develop to release-v1.5.0
I failed to cherry-pick the changes automatically because of the following:
To continue manually you can use these commands: