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

[27] change proftpd ci image #40269

Merged
merged 1 commit into from Sep 5, 2023
Merged

[27] change proftpd ci image #40269

merged 1 commit into from Sep 5, 2023

Conversation

icewind1991
Copy link
Member

Backport of #40201

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Sep 5, 2023
@icewind1991 icewind1991 added this to the Nextcloud 27.1.0 milestone Sep 5, 2023
@icewind1991 icewind1991 requested review from a team, Fenn-CS, sorbaugh and come-nc and removed request for a team September 5, 2023 12:51
@icewind1991
Copy link
Member Author

/backport to stable26

@blizzz blizzz mentioned this pull request Sep 5, 2023
6 tasks
@blizzz blizzz merged commit 36b8f46 into stable27 Sep 5, 2023
37 of 41 checks passed
@blizzz blizzz deleted the ftp-ci-fix-27 branch September 5, 2023 17:21
@backportbot-nextcloud
Copy link

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

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

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

# 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-stable26

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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants