Kubernetes Submit Queue 539165d899 Merge pull request #36075 from rmmh/root-gitattributes ...

Automatic merge from submit-queue

Move .gitattributes annotation to the root, so GitHub will respect them.

This should fix the merge conflicts by letting GitHub use the simpler line-by-line algorithm for this file. Having .gitattributes in a sub-directory would work for local merging, but would show conflicts on the web UI.

2016-11-02 12:13:54 -07:00

..

exceptions.txt

Remove usage of --reconcile-cidr

2016-10-26 20:26:07 +03:00

excluded-flags.txt

Move kubemark, skew, upgrade, leak logic into hack/e2e.go

2016-08-09 14:04:19 -07:00

known-flags.txt

Merge pull request #35493 from madhusudancs/federation-kubefed-01

2016-11-02 10:35:55 -07:00