rsafronov 7034e1de69 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers ... # Conflicts: # core/pkg/ingress/annotations/authreq/main.go		2017-03-13 15:04:37 -04:00
..
main.go	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-13 15:04:37 -04:00
main_test.go	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-13 15:04:37 -04:00