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

contrib: add USB and TLS to ipq40xx-mikrotik and ath79-mikrotik #341

Merged

Conversation

grische
Copy link
Contributor

@grische grische commented Dec 22, 2023

No description provided.

@grische grische requested review from maurerle and a team as code owners December 22, 2023 12:33
@grische grische force-pushed the feature/contrib-tls-ath79-mikrotik branch from 0f4f1d5 to 6670c4b Compare December 22, 2023 12:37
@grische grische changed the title contrib: add USB and TLS to ath79-mikrotik contrib: add USB and TLS to ipq40xx-mikrotik and ath79-mikrotik Dec 22, 2023
@grische grische force-pushed the feature/contrib-tls-ath79-mikrotik branch from 6670c4b to 6ef3457 Compare December 22, 2023 12:42
@grische grische added stable backport next Backport to Next Branch labels Dec 22, 2023
@grische grische merged commit a2929f3 into freifunkMUC:stable Dec 30, 2023
28 checks passed
Copy link
Contributor

Backport failed for next, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin next
git worktree add -d .worktree/backport-341-to-next origin/next
cd .worktree/backport-341-to-next
git checkout -b backport-341-to-next
ancref=$(git merge-base d67474d3e359c5ea376ec9fc4e7b3d6778bdc9f3 6ef3457da2d38c36ff07ce59a22a1e4630e668e4)
git cherry-pick -x $ancref..6ef3457da2d38c36ff07ce59a22a1e4630e668e4

@grische grische deleted the feature/contrib-tls-ath79-mikrotik branch December 30, 2023 13:28
@grische grische restored the feature/contrib-tls-ath79-mikrotik branch December 30, 2023 13:29
Copy link
Contributor

Backport failed for next, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin next
git worktree add -d .worktree/backport-341-to-next origin/next
cd .worktree/backport-341-to-next
git checkout -b backport-341-to-next
ancref=$(git merge-base d67474d3e359c5ea376ec9fc4e7b3d6778bdc9f3 6ef3457da2d38c36ff07ce59a22a1e4630e668e4)
git cherry-pick -x $ancref..6ef3457da2d38c36ff07ce59a22a1e4630e668e4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport next Backport to Next Branch stable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants