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
..
cache	Deny location mapping in case of specific errors	2017-01-12 13:40:32 -03:00
ingress	Merge branch 'master' into nginx/extauth_headers	2017-02-27 16:28:11 -05:00
k8s	add unit test cases for core.pkg.k8s	2017-01-19 15:22:13 +08:00
net	Checks if the TLS secret contains a valid keypair structure, with 'CERTIFICATE' before the Private Key	2017-03-01 15:44:39 -03:00
strings	add unit test for strings.StringInSlice	2017-01-02 00:26:46 +08:00
task	Deny location mapping in case of specific errors	2017-01-12 13:40:32 -03:00
watch	Fix a data race in TestFileWatcher (#24).	2016-11-25 13:20:43 +01:00