rsafronov 05526e4a66 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers ... # Conflicts: # controllers/nginx/pkg/template/template.go		2017-03-02 14:46:18 -05:00
..
etc/nginx	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-02 14:46:18 -05:00
ingress-controller	Split implementations from generic code	2016-11-23 21:17:49 -03:00
Dockerfile	Update nginx version in ingress controller to 1.11.10	2017-02-16 15:10:14 -03:00