Commit Graph

4 Commits (83d80f13dd9b4b43249c4e21badaa0f99c23316f)

Author SHA1 Message Date
Donnie Adams 83d80f13dd
(dev-v2.6-archive) Merge pull request #1289 from thedadams/bump-aks-v1.0.1-rc12
Bump aks-operator chart to 1.0.1-rc12

(partially cherry picked from commit 8400ee4596)
2022-01-06 11:34:31 -08:00
Arvind Iyengar 618b2c4223
(dev-v2.6-archive) Update rancher-kube-state-metrics to new base 086f1f7f0870e110abf30aa6bfe7c141e83cc950
(cherry picked from commit 95cd88b735)

(partially cherry picked from commit 2acb1d6fcf)
2022-01-06 11:34:26 -08:00
Arvind Iyengar 00927521f0
(dev-v2.6-archive) Rebase to 086f1f7f0870e110abf30aa6bfe7c141e83cc950
(cherry picked from commit 383fb984af)

(partially cherry picked from commit 28f95b059f)
2022-01-06 11:34:25 -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