reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source
This commit is contained in:
Matthias Radestock committed 2015-07-01 11:34:50 +01:00
2 parents 312122e1be ba1e75405f
commit badfdee5e4
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
site/weavedns.md
+4 -4
View File
@@ -59,10 +59,10 @@ root@ubuntu:/# ping pingme
...
```
If both hostname and container name are specified at the same time the
hostname takes precedence; in this circumstance if the hostname is not
in the weaveDNS domain the container will not be registered, but will
still use weaveDNS for resolution.
> **Please note** if both hostname and container name are specified at
> the same time the hostname takes precedence; in this circumstance if
> the hostname is not in the weaveDNS domain the container will *not* be
> registered, but will still use weaveDNS for resolution.
It is also possible to force or forbid an application container's use
of weaveDNS with the `--with-dns` and `--without-dns` options to