ArrisLee d191e4f9b9 resolve conflicts

2021-09-02 11:33:53 +12:00

..

adminmonitor

…

archive

feat(git) git clone improvements [EE-451] (#5070)

2021-05-24 17:27:07 +12:00

backup

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

bolt

feat(kubeconfig): Introduce the ability to change the expiry of a kubeconfig EE-1153 (#5421)

2021-09-01 09:23:21 +12:00

chisel

feat(kube): kube app auto update backend (#5547)

2021-08-31 16:12:51 +12:00

cli

feat(server): use https by default (#5315) [EE-332]

2021-08-10 07:59:47 +03:00

cmd/portainer

resolve conflicts

2021-09-02 11:33:53 +12:00

crypto

go 1.13 compatibility

2021-04-07 12:12:19 +12:00

docker

feat(edge) EE-743 enable signature checking for edge agent (#5355)

2021-08-09 17:22:41 +12:00

exec

feat(kube): kube app auto update backend (#5547)

2021-08-31 16:12:51 +12:00

filesystem

feat(kube): kube app auto update backend (#5547)

2021-08-31 16:12:51 +12:00

git

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

http

resolve conflicts

2021-09-02 11:33:53 +12:00

internal

resolve conflicts

2021-09-02 11:33:53 +12:00

jwt

feat(kubeconfig): Introduce the ability to change the expiry of a kubeconfig EE-1153 (#5421)

2021-09-01 09:23:21 +12:00

kubernetes

resolve conflicts

2021-09-02 11:33:53 +12:00

ldap

…

libcompose

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

oauth

fix(oauth): remove expiry time copy logic EE-1085

2021-08-06 00:54:38 +12:00

scheduler

feat(stacks): support automated sync for stacks [EE-248] (#5340)

2021-08-17 13:12:07 +12:00

stacks

feat(kube): kube app auto update backend (#5547)

2021-08-31 16:12:51 +12:00

api-description.md

…

go.mod

feat(stack): backport changes to CE EE-1189

2021-08-19 17:02:20 +12:00

go.sum

feat(stack): backport changes to CE EE-1189

2021-08-19 17:02:20 +12:00

kubernetes.go

…

portainer.go

resolve conflicts

2021-09-02 11:33:53 +12:00

swagger_config.json

…

swagger.yaml

feat(k8s): Introduce the ability to restrict access to default namespace (EE-745) (#5337)

2021-07-23 17:10:46 +12:00