ArrisLee c422bc2530 resolve conflicts

2021-09-07 12:02:25 +12:00

..

component-status

fix(rest): remove timeouts for all REST services (#4385)

2020-11-05 20:49:37 +13:00

components

resolve conflicts

2021-09-06 12:36:24 +12:00

converters

resolve conflicts

2021-09-06 12:36:24 +12:00

custom-templates

feat(kube): introduce custom templates [EE-1125] (#5434)

2021-09-02 17:28:51 +12:00

endpoint

fix(rest): remove timeouts for all REST services (#4385)

2020-11-05 20:49:37 +13:00

filters

feat(k8s/ingress): create multiple ingress network per kubernetes namespace (#4464)

2021-04-28 05:51:13 +12:00

helpers

feat(kube): introduce custom templates [EE-1125] (#5434)

2021-09-02 17:28:51 +12:00

horizontal-pod-auto-scaler

Merge pull request #4415 from portainer/feat/GH/4011-pods-as-applications

2020-11-23 14:57:04 +13:00

ingress

Fix/release commits cherrypick (#5546)

2021-08-31 12:39:19 +12:00

metrics

feat(kubernetes/resource-usage): k8s resource usage for cluster, node and namespace EE-3 EE-1112 (#5301)

2021-07-28 14:26:03 +12:00

models

resolve conflicts

2021-09-06 12:36:24 +12:00

node

Enable the ability to cordon/uncordon/drain nodes (#4723)

2021-03-15 22:36:14 +01:00

pod

feat(container): add sysctls setting in the container view (#4910)

2021-04-12 19:40:45 +12:00

registries

feat(app/registries): add warning modal on registries deletion (#5396)

2021-09-06 17:25:02 +12:00

rest

feat(k8s): review the resource assignement when creating a kubernetes application EE-437 (#5254)

2021-09-01 09:08:01 +12:00

services

feat(k8s): display namespace status and terminating namespaces (#5551)

2021-09-02 23:30:27 +12:00

store

feat(k8s/resource-pool): add the ability to mark/unmark resource pool as system (#5360)

2021-08-26 16:00:59 +02:00

views

resolve conflicts

2021-09-07 12:02:25 +12:00

__module.js

feat(kube): introduce custom templates [EE-1125] (#5434)

2021-09-02 17:28:51 +12:00