k8s-merge-robot 36c07cc554 Merge pull request #27961 from maisem/os-distribution ...

Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

2016-07-15 14:11:47 -07:00

..

.gitattributes

Mark known-flags to merge via union.

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

exceptions.txt

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and

2016-07-15 12:02:31 -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

Merge pull request #27961 from maisem/os-distribution

2016-07-15 14:11:47 -07:00