Merge branch 'v1.5' into master

2018-01-24 11:57:06 +01:00
parent fb4ba7af2b 4afb39778a
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -101,4 +101,3 @@ pages:
    - 'gRPC Example': 'user-guide/grpc.md'
    - 'Traefik cluster example with Swarm': 'user-guide/cluster-docker-consul.md'
  - Benchmarks: benchmarks.md
-  - 'Archive': 'archive.md'