2 Commits (ae9a3ae5ddf39fe0aef4d7888436285219ff82bb)

Author	SHA1	Message	Date
hc-github-team-consul-core	7439701133	Backport of Fix peered service protocols using proxy-defaults. into release/1.14.x (#15200) ... This pull request was automerged via backport-assistant	2022-10-31 09:45:26 -04:00
Paul Glass	c0c187f1c5	Merge central config for GetEnvoyBootstrapParams (#14869) ... This fixes GetEnvoyBootstrapParams to merge in proxy-defaults and service-defaults. Co-authored-by: Dan Upton <daniel@floppy.co>	2022-10-10 12:40:27 -05:00