k8s-merge-robot 72beb65ee5 Merge pull request #27027 from andyzheng0831/gci-network ...

Automatic merge from submit-queue

GCI: add support for network plugin

I had run e2e against a cluster with both master and nodes on GCI a couple of times. The PR auto tests will cover the hybrid cluster with just master on GCI.

cc/ @roberthbailey @fabioy @kubernetes/goog-image

2016-06-08 23:01:19 -07:00

..

.gitattributes

Mark known-flags to merge via union.

2016-06-08 15:59:35 -07:00

exceptions.txt

GCI: add support for kubenet

2016-06-08 13:20:44 -07:00

excluded-flags.txt

Add the check_node_count flag to the excluded flags whitelist.

2016-05-17 10:53:42 -07:00

known-flags.txt

Stop 'drain' deleting pods with local storage.

2016-06-08 14:59:03 -07:00