search

anchore / anchore-engine

A service that analyzes docker images and scans for vulnerabilities
Apache License 2.0
1.58k stars 271 forks source link

Rebase v1.0.1 to master #1296

Closed zburstein closed 2 years ago

zhill commented 2 years ago

@zburstein was this rebased? I'd prefer not to do a rebase since it will mess up commit history between v1.0.1-dev branch and master (and the tags). Normally we just merge it into master, was there a conflict that prevented it that I can help with resolving?

zburstein commented 2 years ago

@zhill Yeah its rebased onto master. Was following this guide so we will have to update it https://github.com/anchore/operations/blob/master/release/platform-release-playbook.md#merge-to-mainline