ArrisLee c4e2ca1fb9 resolve conflicts

2021-06-11 14:14:31 +12:00

..

component-status

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

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

components

Merge pull request #4983 from portainer/feat/EE-352/CE-truncate-image-name-in-tables

2021-06-04 15:20:26 +12:00

converters

fix(service): change application owner label in createPayload (#4841)

2021-03-14 22:48:17 +01: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(k8s/container): realtime metrics (#4416)

2021-04-29 13:10:14 +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

Merge branch 'release/2.5' into develop

2021-05-18 17:02:31 +12:00

metrics

feat(k8s/container): realtime metrics (#4416)

2021-04-29 13:10:14 +12:00

models

resolve conflicts

2021-06-11 14:14:31 +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

rest

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

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

services

feat(kubernetes/summary): summary of k8s actions upon deploying/updating resources EE-436 (#5137)

2021-06-10 10:38:23 +12:00

templates

feat(k8s/resources-list-view): add advanced deployment panel to resources list view (#4516)

2021-01-08 10:29:17 +13:00

views

resolve conflicts

2021-06-11 14:14:31 +12:00

__module.js

feat(k8s/container): realtime metrics (#4416)

2021-04-29 13:10:14 +12:00