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

Update OCP and other dependencies #190

Merged
merged 2 commits into from
Jul 27, 2023
Merged

Update OCP and other dependencies #190

merged 2 commits into from
Jul 27, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Jul 27, 2023

Should fix the Update OCP job failure

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc requested a review from blizzz July 27, 2023 12:44
@come-nc come-nc self-assigned this Jul 27, 2023
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Copy link
Contributor Author

come-nc commented Jul 27, 2023

/backport to stable27

@nickvergessen nickvergessen merged commit 4322c60 into master Jul 27, 2023
10 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix/update-ocp-dep branch July 27, 2023 16:47
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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.

2 participants