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
..
configmap.go	Add configuration and annotation for port_in_redirect	2017-01-21 23:01:21 -03:00
configmap_test.go	Adds support for disabling the entire access_log	2017-02-09 21:20:12 -02:00
template.go	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-02 14:46:18 -05:00
template_test.go	Merge branch 'master' into nginx/extauth_headers	2017-02-27 16:28:11 -05:00