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 release/v3.32.0 with v3.32 with conflicts fixed #7285

Merged
merged 900 commits into from
Sep 9, 2024
Merged

Conversation

KrishnaIyer
Copy link
Member

Summary

Replaces #7284

Changes

Testing

Steps

...

Results
Regressions

...

Notes for Reviewers

Failed to merge submodule data/lorawan-frequency-plans (commits don't follow merge-base)
CONFLICT (submodule): Merge conflict in data/lorawan-frequency-plans
CONFLICT (content): Merge conflict in package.json
CONFLICT (content): Merge conflict in yarn.lock

Checklist

  • Scope: The referenced issue is addressed, there are no unrelated changes.
  • Compatibility: The changes are backwards compatible with existing API, storage, configuration and CLI, according to the compatibility commitments in README.md for the chosen target branch.
  • Documentation: Relevant documentation is added or updated.
  • Testing: The steps/process to test this feature are clearly explained including testing for regressions.
  • Infrastructure: If infrastructural changes (e.g., new RPC, configuration) are needed, a separate issue is created in the infrastructural repositories.
  • Changelog: Significant features, behavior changes, deprecations and fixes are added to CHANGELOG.md.
  • Commits: Commit messages follow guidelines in CONTRIBUTING.md, there are no fixup commits left.

kschiffer and others added 30 commits August 1, 2024 15:57
Use Option+K as main hotkey for the search panel
Fix interference of entity prefetching data with store state
@KrishnaIyer KrishnaIyer requested review from a team as code owners September 6, 2024 07:26
@github-actions github-actions bot added c/console This is related to the Console c/identity server This is related to the Identity Server c/gateway server This is related to the Gateway Server dependencies Pull requests that update a dependency file ui/web This is related to a web interface tooling Development tooling labels Sep 6, 2024
@KrishnaIyer KrishnaIyer self-assigned this Sep 6, 2024
@github-actions github-actions bot added ui/cli This is related to ttn-lw-cli compat/config This could affect Configuration compatibility labels Sep 6, 2024
@KrishnaIyer KrishnaIyer mentioned this pull request Sep 9, 2024
@KrishnaIyer KrishnaIyer merged commit f6ae401 into v3.32 Sep 9, 2024
13 of 15 checks passed
@KrishnaIyer KrishnaIyer deleted the merge/release branch September 9, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c/console This is related to the Console c/gateway server This is related to the Gateway Server c/identity server This is related to the Identity Server compat/config This could affect Configuration compatibility dependencies Pull requests that update a dependency file tooling Development tooling ui/cli This is related to ttn-lw-cli ui/web This is related to a web interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants