Merge branch 'stable' into hotfix-1.3.5

This commit is contained in:
Bertrand Gouny 2017-03-20 08:45:03 +01:00
commit ec1f596785
1 changed files with 1 additions and 1 deletions

View File

@ -131,7 +131,7 @@ If you need to add your custom TLS certificate, bootstrap config or environment
Dockerfile example: Dockerfile example:
FROM osixia/osixia/keepalived:1.3.5 FROM osixia/keepalived:1.3.5
MAINTAINER Your Name <your@name.com> MAINTAINER Your Name <your@name.com>
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf