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

Remove nap plus version override #2079

Merged
merged 1 commit into from
Oct 13, 2021
Merged

Remove nap plus version override #2079

merged 1 commit into from
Oct 13, 2021

Conversation

ciarams87
Copy link
Contributor

Proposed changes

Remove nap plus version override

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@github-actions github-actions bot added the chore Pull requests for routine tasks label Oct 12, 2021
lucacome
lucacome reviewed Oct 12, 2021
View reviewed changes
build/Dockerfile Outdated Show resolved Hide resolved
@nginx-bot nginx-bot force-pushed the chore/update-nap-r25 branch 3 times, most recently from fddc2c7 to 28b8db0 Compare October 12, 2021 19:50
@lucacome
Copy link
Member

I think we should merge this into release-2.0 first and then merge the branch to master after release to avoid duplicate commits.

@nginx-bot nginx-bot force-pushed the chore/update-nap-r25 branch 2 times, most recently from b43989c to c32e288 Compare October 13, 2021 00:05
@ciarams87 ciarams87 force-pushed the chore/update-nap-r25 branch from c32e288 to 11d33dd Compare October 13, 2021 08:36
@ciarams87 ciarams87 force-pushed the chore/update-nap-r25 branch from 11d33dd to 648bdf2 Compare October 13, 2021 08:37
@ciarams87
Copy link
Contributor Author

I think we should merge this into release-2.0 first and then merge the branch to master after release to avoid duplicate commits.

@lucacome Master branch is failing and I don't want to have to wait for the minor release to fix it. I'm still not sure of the need to merge in the commits/ tag from release to master the way we do anyway.

@ciarams87 ciarams87 merged commit 2a78594 into master Oct 13, 2021
@ciarams87 ciarams87 deleted the chore/update-nap-r25 branch October 13, 2021 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucacome lucacome lucacome left review comments

@tomasohaodha tomasohaodha tomasohaodha approved these changes

@soneillf5 soneillf5 soneillf5 approved these changes

@pleshakov pleshakov Awaiting requested review from pleshakov

@vepatel vepatel Awaiting requested review from vepatel

Assignees
No one assigned
Labels
chore Pull requests for routine tasks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ciarams87 @lucacome @soneillf5 @tomasohaodha