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
..
cache	Deny location mapping in case of specific errors	2017-01-12 13:40:32 -03:00
ingress	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-13 15:04:37 -04:00
k8s	add unit test cases for core.pkg.k8s	2017-01-19 15:22:13 +08:00
net	allow specifying custom dh param	2017-03-08 15:32:32 +01: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