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

branch: merge v1.3.0 fix ups from master to develop #1917

Merged
merged 24 commits into from
Oct 13, 2023
Merged

Conversation

brilliant-lx
Copy link
Collaborator

@brilliant-lx brilliant-lx commented Oct 12, 2023

Description

v1.3.0 was mainly for big merge, but the current develop branch contains many code for PBSS, which are not included in master branch. So we decided to merge bugfix PRs to master directly, instead of: PR -> Develop -> Master.

As v1.3.0 has been delivered, now we can merge these PRs back to develop.

Rationale

NA

Example

NA

Changes

NA

brilliant-lx and others added 23 commits June 20, 2023 20:01
release: draft release v1.2.7
release: draft release v1.2.8
release: draft release v1.2.9
PR merge will append the PR number at the end, like:... (#1805), which
has extra 8 characters
When MatcherSession encounters an error, it attempts to close the session.
Closing waits for all goroutines to finish, including the 'distributor'.
However, the distributor will not exit until all requests have returned.

This patch fixes the issue by delivering the (empty) result to the distributor
before calling Close().
* cmd: add tests for init-network command

* cmd: add setup function
Co-authored-by: buddh0 <galaxystroller@gmail.com>
@brilliant-lx brilliant-lx changed the title merge master to develop branch: merge v1.3.0 fix ups from master to develop Oct 12, 2023
Copy link

@RenRick RenRick left a comment

Choose a reason for hiding this comment

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

LGTM

@brilliant-lx brilliant-lx merged commit 423d413 into develop Oct 13, 2023
8 of 10 checks passed
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.

8 participants