k8s-merge-robot bc1c1c1360 Merge pull request #27972 from mml/fed-backend2 ...

Automatic merge from submit-queue

A few changes to federated-service e2e test.

Most of the changes that get the test to pass have been made already or
elsewhere.  Here we restructure a bit fixing a nesting problem, extend the
timeouts, and start creating distinct backend pods that I'll delete in the
non-local test (coming shortly).

Also some extra debugging info in the DNS code.  I made some upstream
changes to skydns in https://github.com/skynetservices/skydns/pull/283

For #27739

Includes a commit from @madhusudancs that I will remove once his merges.

2016-06-23 22:48:08 -07:00

..

dns_test.go

Updating KubeDNS to try a local service first for federation query

2016-06-23 17:50:12 -07:00

dns.go

Merge pull request #27972 from mml/fed-backend2

2016-06-23 22:48:08 -07:00

doc.go

…

treecache.go

Verify that the we get a non-nil subtree before consulting it.

2016-06-23 09:51:14 -07:00