consul

Author	SHA1	Message	Date
Nathan Coleman	1f636715d0	Trigger OSS => ENT merge for all release branches (#17853 ) Previously, this only triggered for release/..x branches; however, our release process involves cutting a release/1.16.0 branch, for example, at time of code freeze these days. Any PRs to that branch after code freeze today do not make their way to consul-enterprise. This will make behavior for a .0 branch consistent with current behavior for a .x branch.	2023-06-23 14:14:55 -04:00
Ronald	e818fdead0	Copyright headers for config files git + circleci (#16703 ) * Copyright headers for config files git + circleci * Release folder copyright headers	2023-03-22 09:17:19 -04:00
Dhia Ayachi	4f17f3ba44	fix 'releases/..x' to 'release/..x' (#13132 )	2022-05-19 10:01:57 -04:00
Dhia Ayachi	a4e940907c	fix yaml alignment (#13105 )	2022-05-17 11:41:23 -04:00
Dhia Ayachi	0d6df0850c	add a github workflow to trigger ent->oss merge on every PR merged (#13072 ) * add a github workflow to trigger ent->oss merge on every PR merged * remove the workflow automation ref to trigger-oss-merge in circle-ci * remove workflow automation * revert circle-ci changes * add actor * remove cherrypicker * add condition to avoid running in enterprise	2022-05-17 11:32:40 -04:00