tree 7add721eb4d3525f6452e3d244666a63bcacbc48
parent bd98e6b0d151fa6d511ce93309bce84429e736d9
parent efcb6925cda5899b65ca7dac3ce0878ec1bda4da
author Jakub Josef <jjosef@mirantis.com> 1515591832 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> 1515591832 +0000

Merge "default nginx-proxy config for OSS"