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

feat: release 3.6.1 #10338

Closed

Conversation

Revolyssup
Copy link
Contributor

Description

Fixes # (issue)

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

@AlinsRan
Copy link
Contributor

AlinsRan commented Oct 15, 2023

Please check for errors in CI.

Copy link
Contributor

@AlinsRan AlinsRan left a comment

Choose a reason for hiding this comment

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

The changelog contains PR #10314, but there seems to be no cherry-pick.

@Revolyssup
Copy link
Contributor Author

Revolyssup commented Oct 15, 2023

The changelog contains PR #10314, but there seems to be no cherry-pick.

The commit previous to that already made that change. So adding that commit gave the error "no changes". Should I remove this commit from the changelog then? @AlinsRan

@AlinsRan
Copy link
Contributor

@Revolyssup You may need to pay attention to the sequence of cherry-pick operations.

## 3.6.1

### Core

Copy link
Member

Choose a reason for hiding this comment

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

we need to add apisix-base upgrade for fix CVE-2023-44487 #10320

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@AlinsRan Just to confirm, no changes related to apisix-base needed in this repo right?

Copy link
Contributor

@AlinsRan AlinsRan Oct 24, 2023

Choose a reason for hiding this comment

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

Yes. We have not yet introduced apisix runtime.

@Revolyssup
Copy link
Contributor Author

Revolyssup commented Oct 17, 2023

fix doc lint

@AlinsRan I applied the commits in the sequence they are present. But applying e0d0 after 7279 gave the error that "no new changes"
Screenshot 2023-10-17 at 10 13 55 AM

@moonming
Copy link
Member

3.6.1 should be a new branch, why merge to 3.6?

@moonming moonming closed this Oct 18, 2023
@Revolyssup Revolyssup reopened this Oct 19, 2023
@monkeyDluffy6017
Copy link
Contributor

#10328 which one do you prefer to use?

@soulbird
Copy link
Contributor

This is a patch version, you need to refer to this: #9559

This means you need to close #10328 and merge the content here

@Revolyssup
Copy link
Contributor Author

#10328 which one do you prefer to use?

This one

@Revolyssup
Copy link
Contributor Author

superceded by #10383

@Revolyssup Revolyssup closed this Oct 24, 2023
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.

7 participants