tree 95bcefd345fbd748a9e7ea3f83481c9f8cadc256
parent 7a2b511d60f785092ac23c442ac87c5d14facdf7
parent 2e48de39a0156db415498e6bb71369cfc7ec8d3e
author mcp-jenkins <mcp-jenkins@mirantis.com> 1533929941 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> 1533929941 +0000

Merge "Add correct condition to support calico, oc32 and oc40 in kubelet"