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
..
cmd/controller	Fix build	2017-03-12 18:11:03 -03:00
config	Cleanup collection of prometheus metrics	2017-03-10 16:47:08 -03:00
metric/collector	Fix build	2017-03-12 18:11:03 -03:00
template	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-13 15:04:37 -04:00
version	Split implementations from generic code	2016-11-23 21:17:49 -03:00