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.

Sign up for GitHub

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

Jump to bottom

Bumped version from 1.2.0 -> 1.3.0-devel #1007

Merged
merged 1 commit into from
Aug 31, 2023
Merged

Bumped version from 1.2.0 -> 1.3.0-devel #1007

merged 1 commit into from
Aug 31, 2023

Conversation

rsundriyal
Copy link
Contributor

FLEVEL 190 -> 200

Updated the News to have section for the new version and added previous patch versions.

micahsnyder
micahsnyder reviewed Aug 23, 2023
View reviewed changes
Copy link
Contributor

@micahsnyder micahsnyder left a comment

Choose a reason for hiding this comment

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

Everything looks good to me. We'll have to hold on to this until after the release.

#1005 will also cause a minor merge conflict so we'll have to touchup this PR after that merges.

@micahsnyder
Copy link
Contributor

Just fixed the merge conflict through the GUI. Will watch test pipelines for success before squash-merging.

@rasundri @micahsnyder
Bumped version from 1.2.0 -> 1.3.0-devel
3452dca 
FLEVEL 190 -> 200

Updated the News to have section for the new version and added previous patch versions.
@micahsnyder
Copy link
Contributor

Turns out that fixing a merge conflict in GitHub web UI does not rebase. It adds a merge conflict. This branch was actually quite out of date, missing the optparser size changes. So it was failing some tests relating to logsize (in jenkins).

I just manually reset the branch to be based off the latest from the main branch and reapplied the changes, and squashed the 2nd commit into the first.

It should pass those tests now. But will wait to confirm.

@micahsnyder micahsnyder merged commit 1ba3f03 into Cisco-Talos:main Aug 31, 2023
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@micahsnyder micahsnyder micahsnyder approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rsundriyal @micahsnyder @rasundri