tree 819186efc3392dac97a4732cf391bffe11d48934
parent 2847c68d0ea21732337c11e0a2d2842ba1902310
parent 19a3960988f82670a67691f632cfa38584486c8c
author mcp-jenkins <mcp-jenkins@mirantis.com> 1503906252 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> 1503906253 +0000

Merge "add support for proxy in docker"