6 Commits

Author	SHA1	Message	Date
Julius Volz	099df0c5f0	Migrate "golang.org/x/net/context" -> "context" (#3333) ... In some places, where ctxhttp or gRPC are concerned, we still need to use the old contexts.	2017-10-24 21:21:42 -07:00
Goutham Veeramachaneni	3f0267c548	Merge branch 'dev-2.0' into go-kit/log ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	2017-09-15 23:15:27 +05:30
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	2017-09-08 22:01:51 +05:30
Johannes 'fish' Ziemke	70f3d1e9f9	k8s: Support discovery of ingresses (#3111) ... * k8s: Support discovery of ingresses * Move additional labels below allocation This makes it more obvious why the additional elements are allocated. Also fix allocation for node where we only set a single label. * k8s: Remove port from ingress discovery * k8s: Add comment to ingress discovery example	2017-09-04 13:10:44 +02:00
Fabian Reinartz	2ff8855ae6	discovery/k8s: update client library	2017-05-11 13:53:12 +02:00
Fabian Reinartz	d19d1bcad3	discovery: move into top-level package	2016-11-22 12:56:33 +01:00