8 Commits (f19d9c425e2a3c58c1c09db93d3eedab45a29b47)

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	c025fa3186	(dev-v2.6-archive) Merge pull request #1506 from jiaqiluo/bump-rancher-alerting-drivers ... (partially cherry picked from commit 980b1e982a)	2022-01-06 11:36:59 -08:00
Jiaqi Luo	9c20f21dec	(dev-v2.6-archive) bump sachet tag to 0.2.6 ... (partially cherry picked from commit 39dbe9c981)	2022-01-06 11:36:56 -08:00
Donnie Adams	f70df3c9be	(dev-v2.6-archive) Make charts ... (partially cherry picked from commit 4064bd9bcc)	2022-01-06 11:36:56 -08:00
Donnie Adams	029f66cbe7	(dev-v2.6-archive) Revert "Make charts" ... This reverts commit f93ca8d163. (partially cherry picked from commit 3c9523e5fb)	2022-01-06 11:36:41 -08:00
Donnie Adams	9d1318b381	(dev-v2.6-archive) Make charts ... (partially cherry picked from commit f93ca8d163)	2022-01-06 11:36:33 -08:00
Kinara Shah	4cdf2ee047	(dev-v2.6-archive) make patch && make prepare && make clean ... (partially cherry picked from commit 5c17cdca57)	2022-01-06 11:35:43 -08:00