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

..

e2e

Merge pull request #35739 from foxish/migrating-the-annotation

2016-11-02 09:58:00 -07:00

e2e_node

Disable gci-mounter in cri node e2e tests

2016-11-01 18:00:43 -07:00

fixtures

Fix typos and linted_packages sorting

2016-10-31 18:31:08 +01:00

images

Fix typos and linted_packages sorting

2016-10-31 18:31:08 +01:00

integration

Make GenericApiServer.Run interruptable and fail on first listen

2016-11-01 09:50:56 +01:00

kubemark

Revert "Make master components in kubemark monitored by supervisord"

2016-11-02 14:43:09 +01:00

list

Improve update_owners.py username detection and error message.

2016-10-28 13:23:19 -07:00

soak

serve_hostnames: fix compilation

2016-10-25 09:27:17 -07:00

utils

periodically GC pod ips

2016-10-27 22:15:35 -07:00

OWNERS

Move blunderbuss assignees into tree

2016-03-02 20:46:32 -05:00

test_owners.csv

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

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