8 Commits (365f904499514799908780239dee35120735eb63)

Author	SHA1	Message	Date
Anna Blendermann	3ed8deba88	(dev-v2.6-archive) Merge pull request #1505 from annablender/fix-merge-logging ... [2.6.3] Expose Merge_Log field to disable JSON parsing in logs (partially cherry picked from commit 0902f7c03f)	2022-01-06 11:37:01 -08:00
Anna Blendermann	0fe1eaf145	(dev-v2.6-archive) Expose Merge_Log fields to make log options configurable ... (partially cherry picked from commit 1031e462fd)	2022-01-06 11:37:00 -08:00
Jiaqi Luo	c19a5d213d	(dev-v2.6-archive) bump prom2teams tag to 3.2.3 ... (partially cherry picked from commit 3cfd442c15)	2022-01-06 11:36:57 -08:00
Jiaqi Luo	e0d55a7e0b	(dev-v2.6-archive) Merge pull request #1326 from jiaqiluo/bump-prom2teams ... (partially cherry picked from commit 293c2d1726)	2022-01-06 11:34:55 -08:00
Jiaqi Luo	cbc7bf7930	(dev-v2.6-archive) bump rancher-backup to 2.2.0-rc3 ... (partially cherry picked from commit 0dfe93daf8)	2022-01-06 11:34:52 -08:00
Jiaqi Luo	787d44d9f2	(dev-v2.6-archive) bump rancher/mirrored-idealista-prom2teams to 3.2.2 ... (partially cherry picked from commit 84dc16da80)	2022-01-06 11:34:51 -08:00
Jiaqi Luo	bd7135beb9	(dev-v2.6-archive) add missing permission in the podSecurityPolicy for rancher-prom2teams ... (partially cherry picked from commit d9f7aa887b)	2022-01-06 11:34:07 -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