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.6.x] fix: export API CRD plan flows #10493

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2025

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


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


Cherry-pick of ec1c2ca has failed:

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

You are currently cherry-picking commit ec1c2ca486.
  (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-management-v2/gravitee-apim-rest-api-management-v2-rest/src/main/java/io/gravitee/rest/api/management/v2/rest/mapper/ApiCRDMapper.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


📚  View the storybook of this branch here

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

mergify bot commented Jan 21, 2025

Cherry-pick of ec1c2ca has failed:

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

You are currently cherry-picking commit ec1c2ca486.
  (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-management-v2/gravitee-apim-rest-api-management-v2-rest/src/main/java/io/gravitee/rest/api/management/v2/rest/mapper/ApiCRDMapper.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.6.x/pr-10480 branch from d42b7aa to 2d6a419 Compare January 22, 2025 16:02
@kamiiiel kamiiiel enabled auto-merge (rebase) January 22, 2025 16:12
@kamiiiel kamiiiel merged commit 49a0d86 into 4.6.x Jan 22, 2025
37 of 39 checks passed
@kamiiiel kamiiiel deleted the mergify/bp/4.6.x/pr-10480 branch January 22, 2025 16:24
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