Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-02-29 19:13:23 +00:00
commit 7cdf273c88
1 file changed
-1
-1
View File
@@ -18,7 +18,6 @@ hosts.
* [Adding and removing extra DNS entries](#add-remove)
* [Resolve weaveDNS entries from host](#resolve-weavedns-entries-from-host)
* [Hot-swapping service containers](#hot-swapping)
* [Retaining DNS entries when containers stop](#retain-stopped)
* [Configuring a custom TTL](#ttl)
* [Configuring the domain search path](#domain-search-path)
* [Using a different local domain](#local-domain)