tree f2cfa1ab8159378f6eb9bd707182db41398ecc85
parent e783cc2b890590d0127beea5b9e86e99ea585c33
parent 735d2fd5a21d2721468c63598553cb4115cdbb8c
author Jakub Josef <jjosef@mirantis.com> 1507717365 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> 1507717365 +0000

Merge "possibility of defining proxy timeouts"