Anthony Lapenna 2cabfd574c Merge branch 'develop' into edge ...

# Conflicts:
#	api/portainer.go

2019-05-27 11:29:35 +12:00

..

attach.go

feat(extensions): introduce RBAC extension (#2900)

2019-05-24 18:04:58 +12:00

dial_windows.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00

dial.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00

exec.go

Merge branch 'develop' into edge

2019-05-27 11:29:35 +12:00

handler.go

feat(extensions): introduce RBAC extension (#2900)

2019-05-24 18:04:58 +12:00

hijack.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00

initdial.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00

proxy.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00

stream.go

refactor(api): minor refactor to stream.go

2019-05-13 09:20:55 +12:00

types.go

feat(containers): add support docker attach (#2842)

2019-05-09 14:04:40 +12:00