Enable private repos - merge conflict fixed

jwilder / docker-discover

Service discovery for docker container

MIT License

210 stars 63 forks source link

Enable private repos - merge conflict fixed #8

Open charford opened 9 years ago

charford commented 9 years ago

Hi there, a previous pull request was created that adds support for private registries. I've confirmed the fix worked, but the said pull request had merge conflicts. Here's a conflict free merge request.