tree cbe4c775a5041f5f2d7b252d12521edea1319db9
parent 3e4fcdc4859bf1067b8c3169d8826c504609e29b
parent c6e6bb98208621f1e80dea622206082d94774a39
author mcp-jenkins <mcp-jenkins@mirantis.com> 1548087596 +0000
committer Gerrit Code Review <mail@domain.com> 1548087596 +0000

Merge "Bump cri-proxy to 0.14"