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

Merge updated upstream tag v25.1.14 #1541

Merged
merged 5 commits into from
Jan 15, 2025

Conversation

schlimmchen
Copy link
Member

Thomas performed a second release yesterday with the same Git tag, after we already merged yesterday's first release. This changeset merges the updated Git tag.

tbnobody and others added 5 commits January 14, 2025 19:14
…ch don't need a device profile

This patch introduces a define which allows to specifiy for each environment if a device profile is absolutly required.

Fixes tbnobody#2500
merges the second version of upstream tag v25.1.14.
@schlimmchen schlimmchen force-pushed the schlimmchen/merge-upstream-v25.1.14-updated branch from d3e5db7 to 27adb8a Compare January 15, 2025 18:49
@schlimmchen schlimmchen marked this pull request as ready for review January 15, 2025 18:49
@schlimmchen
Copy link
Member Author

@AndreasBoehm After submitting your review, merge using the CLI: git fetch development; git switch development; git reset --hard schlimmchen/merge-upstream-v25.1.14-updated, then, after double-checking, git push hoylabs. I guess you know what I mean. Like we did with your PR yesterday.

@AndreasBoehm AndreasBoehm merged commit 27adb8a into development Jan 15, 2025
16 checks passed
@AndreasBoehm AndreasBoehm deleted the schlimmchen/merge-upstream-v25.1.14-updated branch January 15, 2025 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants