tree c4f9c171ccbecc8b3ac33fd573138cad540b1124
parent 2d5a64a1391dcc4becfd8dd49384781d62393f54
parent f05141eaf6145cd5672daad3fb647831aabdc93c
author mcp-jenkins <mcp-jenkins@mirantis.com> 1538058183 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> 1538058183 +0000

Merge "Fix criproxy and dockershim deployment on masters"