tree 6bedddd5b8e1459ec80828b45a8a29d42a5a7c1c
parent 0d748630cdcc569f69160dcdf3a2fd0c67dc1413
parent 6767a7e5c85a2c6097154ed5a1959f36dc7ce186
author Ales Komarek <akomarek@mirantis.com> 1499177193 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1499177195 +0000

Merge "Add haproxy artifactory configuration"