Skip to content

Conversation

@kmpm
Copy link
Contributor

@kmpm kmpm commented May 25, 2021

@CLAassistant
Copy link

CLAassistant commented May 25, 2021

CLA assistant check
All committers have signed the CLA.

@francislavoie
Copy link
Member

@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
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

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
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

add propagation_timeout support in caddyfile

4 participants