Merge Conflict Resolution (from 7.3.x to 7.4.x)

confluentinc / common-docker

Confluent Commons with support for building and testing Docker images.

Apache License 2.0

4 stars 69 forks source link

Merge Conflict Resolution (from 7.3.x to 7.4.x) #563

Closed KrishVora01 closed 1 week ago

KrishVora01 commented 1 week ago

Change Description

This PR is a Merge Conflict Resolution (from 7.3.x to 7.4.x). PR had to be raised to adhere to the new airlock workflow.

Testing

PR checks.

confluent-cla-assistant[bot] commented 1 week ago

:tada: All Contributor License Agreements have been signed. Ready to merge.
_{Please push an empty commit if you would like to re-run the checks to verify CLA status for all contributors.}