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

caddytls: Add Caddyfile support for propagation_timeout #4178

Merged
merged 2 commits into from
Jun 7, 2021
Merged

caddytls: Add Caddyfile support for propagation_timeout #4178

merged 2 commits into from
Jun 7, 2021

Conversation

kmpm
Copy link
Contributor

@kmpm kmpm commented May 25, 2021

@CLAassistant
Copy link

CLAassistant commented May 25, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@francislavoie
Copy link
Member

Please add a Caddyfile adapt test https://github.com/caddyserver/caddy/tree/master/caddytest/integration/caddyfile_adapt

@francislavoie francislavoie added needs tests 💯 Requires automated tests under review 🧐 Review is pending before merging labels May 25, 2021
@francislavoie francislavoie added this to the v2.5.0 milestone May 25, 2021
@francislavoie francislavoie changed the title add propagation_timeout to UnmarshalCaddyfile caddytls: Add Caddyfile support for propagation_timeout May 25, 2021
@francislavoie francislavoie removed the needs tests 💯 Requires automated tests label May 26, 2021
mholt
mholt approved these changes Jun 3, 2021
View reviewed changes
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

Awesome, thanks for the test case!

@mholt
Copy link
Member

mholt commented Jun 3, 2021

@francislavoie Should we merge this into master or the 2.5 branch?

@francislavoie
Copy link
Member

francislavoie commented Jun 3, 2021 •
edited
Loading

There's no breaking change here, just adds a config property that wasn't there before, so it's no problem if it lands in 2.4.2 👍 (the milestone didn't exist before, I had just set it to the next available one)

@francislavoie francislavoie modified the milestones: v2.5.0, v2.4.2 Jun 3, 2021
mholt
mholt approved these changes Jun 7, 2021
View reviewed changes
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

Thank you!

@mholt mholt removed the under review 🧐 Review is pending before merging label Jun 7, 2021
@mholt mholt merged commit 4c2da18 into caddyserver:master Jun 7, 2021
@kmpm kmpm deleted the caddyfile-propagation branch June 9, 2021 16:31
@francislavoie francislavoie mentioned this pull request Jun 14, 2021
Merged
@flappyjet flappyjet mentioned this pull request Oct 13, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mholt mholt mholt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.4.2
Development

Successfully merging this pull request may close these issues.

add propagation_timeout support in caddyfile
4 participants
@kmpm @CLAassistant @francislavoie @mholt