Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.5.x] fix: add missing mapping for UpdateApiEntity #10558

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

This is an automatic copy of pull request #10553 done by Mergify.


see: https://gravitee.atlassian.net/browse/GKO-934


Cherry-pick of 4048cf7 has failed:

On branch mergify/bp/4.5.x/pr-10553
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit 4048cf768c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/infra/adapter/ApiAdapter.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner January 29, 2025 11:16
@mergify mergify bot added the conflicts label Jan 29, 2025
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of 4048cf7 has failed:

On branch mergify/bp/4.5.x/pr-10553
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit 4048cf768c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/infra/adapter/ApiAdapter.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kamiiiel kamiiiel force-pushed the mergify/bp/4.5.x/pr-10553 branch from c328d2c to 5d215a7 Compare January 29, 2025 14:04
@kamiiiel kamiiiel enabled auto-merge (rebase) January 29, 2025 14:05
@kamiiiel kamiiiel merged commit 5ca7e09 into 4.5.x Jan 29, 2025
18 of 19 checks passed
@kamiiiel kamiiiel deleted the mergify/bp/4.5.x/pr-10553 branch January 29, 2025 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant