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

Pull upstream #2

Merged
merged 13 commits into from
May 9, 2024
Merged

Pull upstream #2

merged 13 commits into from
May 9, 2024

Conversation

TaylorCarpenter
Copy link

@TaylorCarpenter TaylorCarpenter commented Mar 21, 2024

I'm driving this for Taylor. To his credit, he created the PR for this branch.

Changes:

  1. Created token-main branch at the same point where this branch started (for less confusion).
  2. Changed the merge target for it.
  3. Asked David to change the default branch to be token-main rather than main.

Standard review rules apply.

TaylorCarpenter and others added 2 commits March 21, 2024 18:51
Not all example code can be fully compiled. This avoids errors being
thrown by the CI server from this known issue.
@TaylorCarpenter TaylorCarpenter self-assigned this Mar 21, 2024
@mattcaron-token mattcaron-token changed the base branch from main to token-main May 9, 2024 14:16
Copy link

@DavidZemon DavidZemon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link

@mattcaron-token mattcaron-token left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The last commit needs its commit message revised and a trace removed (or changed to not a trace).

embassy-stm32-wpan/src/consts.rs Outdated Show resolved Hide resolved
embassy-stm32-wpan/src/sub/mm.rs Outdated Show resolved Hide resolved
@TaylorCarpenter TaylorCarpenter merged commit b75ca66 into token-main May 9, 2024
1 check passed
@mattcaron-token mattcaron-token deleted the pull_upstream branch May 15, 2024 14:06
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