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

[stable27] feat: add switch to disable dns pinning #40162

Merged
merged 1 commit into from Aug 30, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #40108

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb added the 4. to release Ready to be released and/or waiting for tests to finish label Aug 30, 2023
@kesselb kesselb merged commit 03da441 into stable27 Aug 30, 2023
37 checks passed
@kesselb kesselb deleted the backport/40108/stable27 branch August 30, 2023 18:38
@kesselb
Copy link
Contributor

kesselb commented Aug 30, 2023

/backport to stable26

@backportbot-nextcloud
Copy link
Author

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

1 similar comment
@backportbot-nextcloud
Copy link
Author

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

@blizzz blizzz mentioned this pull request Aug 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants