4 Commits (f6a2413ba49e5b597e199bd0c9a6f1240e62e95f)

Author	SHA1	Message	Date
Mauren Berti	88cb96736d	Pull upstream changes.	2022-12-08 15:49:58 -05:00
Mauren Berti	32ef60ab47	Rebase rancher-logging from 3.17.7 to 3.17.10.	2022-12-08 15:49:28 -05:00
Jacob Payne	46d571c65c	(dev-v2.6-archive) rancher logging upstream upgrade to 3.15 ... (partially cherry picked from commit 73c29779b0)	2022-01-06 11:37:03 -08:00
Arvind Iyengar	63af4011e1	(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ... ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14e)	2022-01-06 11:33:32 -08:00