Merge branch 'v1.4' into master

2017-11-27 11:40:50 +01:00 · 2017-11-27 11:40:50 +01:00 · 9f6f637527
commit 9f6f637527
parent 8cd72cfc1b 0f09551a76
2 changed files with 4 additions and 4 deletions
--- a/provider/kubernetes/kubernetes_test.go
+++ b/provider/kubernetes/kubernetes_test.go
@ -1543,7 +1543,7 @@ func TestIngressAnnotations(t *testing.T) {
 				PassHostHeader: true,
 				Routes: map[string]types.Route{
 					"/api": {
-						Rule: "ReplacePath:/",
+						Rule: "PathPrefix:/api;ReplacePath:/",
 					},
 					"rewrite": {
 						Rule: "Host:rewrite",