Merge branch 'v1.5' into master

This commit is contained in:
Fernandez Ludovic 2018-03-21 22:43:15 +01:00
commit 007a1fc7f2
8 changed files with 26 additions and 16 deletions

View file

@ -1,6 +1,7 @@
package server
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@ -9,8 +10,6 @@ import (
"testing"
"time"
"context"
"github.com/containous/flaeg"
"github.com/containous/mux"
"github.com/containous/traefik/configuration"