Merge branch '1.0'

Conflicts:
	site/weavedns.md
This commit is contained in:
Adam Harrison committed 2015-09-02 17:09:39 +01:00
commit 3097565664
1 file changed
-3
-3
View File
@@ -162,9 +162,6 @@ command:
$ weave dns-remove 10.2.1.27 $C
```
When queried about a name with multiple IPs, weaveDNS returns all IPs
available in a random order.
## <a name="resolve-weavedns-entries-from-host"></a>Resolve weaveDNS entries from host
You can resolve entries from any host running weaveDNS with `weave