4 Commits (50b358048bfb7a62ccc91bccf42d8653210a24f0)

Author	SHA1	Message	Date
Derek Nola	e7fe71ea1e	[Engine-1.21] Secrets-encryption rotation (#4656) ... * Backport secrets encrypt rotation * Backport integration fixes for custom etcd args Signed-off-by: Derek Nola <derek.nola@suse.com>	2021-12-07 21:55:00 -08:00
Brian Downs	30c7723c03	[Engine-1.21] All bootstrap backport (#4451) ... Add ability to reconcile bootstrap data between datastore and disk (#3398)	2021-11-10 16:20:33 -07:00
Brad Davidson	7d0ecf3ab2	Revert "Backport bootstrap engine 1.21 (#4314)" ... This reverts commits c5a9154538 45c5d78cd7 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>	2021-10-27 13:46:00 -07:00
Brian Downs	45c5d78cd7	Backport bootstrap engine 1.21 (#4314)	2021-10-25 13:03:30 -07:00