Merge branch 'v1.3' into merge-back-1_3_0-rc3

2017-05-24 20:39:38 +02:00
parent 64e8b31d49 dbfd2663c2
commit 2833d68f15
17 changed files with 357 additions and 195 deletions
--- a/templates/kubernetes.tmpl
+++ b/templates/kubernetes.tmpl
@@ -1,4 +1,5 @@
 [backends]{{range $backendName, $backend := .Backends}}
+    [backends."{{$backendName}}"]
    {{if $backend.CircuitBreaker}}
    [backends."{{$backendName}}".circuitbreaker]
      expression = "{{$backend.CircuitBreaker.Expression}}"