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

reorder includes to avoid Boost L conflict #6595

Merged
merged 1 commit into from May 18, 2018

Conversation

Projects
None yet
3 participants
@Habbie
Member

Habbie commented May 10, 2018

Short description

See #6542, #6516, #6358.

This is an alternative to #6517 which could still be merged eventually.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master

@Habbie Habbie added this to the rec-4.1.x milestone May 10, 2018

@rgacogne

This comment has been minimized.

Member

rgacogne commented May 10, 2018

I'm torn because #6517 is a big diff, which feels wrong for a minor release, but it would make backporting things from master much easier in the future.

@Habbie

This comment has been minimized.

Member

Habbie commented May 10, 2018

I'm torn because #6517 is a big diff, which feels wrong for a minor release, but it would make backporting things from master much easier in the future.

We had the same discussion on the auth side last week - but there we really wanted to release so we went for the shorter one. As said, the longer one can still go in later. I am also torn on it, and indeed it has caused me trouble in backporting a few times already.

@pieterlexis pieterlexis merged commit 9f9da4e into PowerDNS:rel/rec-4.1.x May 18, 2018

4 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
lgtm analysis: C/C++ No alert changes
Details
lgtm analysis: JavaScript No alert changes
Details
lgtm analysis: Python No alert changes
Details

@rgacogne rgacogne referenced this pull request Aug 24, 2018

Merged

rec-4.0.x: reorder includes to avoid Boost L conflict #6875

4 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment