primal/traefik
1
0
Fork 0
mirror of https://github.com/traefik/traefik synced 2026-02-03 11:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.5' into master

Browse Source
This commit is contained in:
Fernandez Ludovic
2018-02-27 14:07:07 +01:00
parent 6f81e3479a 422109b82f
commit a2db3e0499
18 changed files with 684 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/grpc_test.go
+1 -1
View File
@@ -1,6 +1,7 @@
package integration
import (
"context"
"crypto/rand"
"crypto/tls"
"crypto/x509"
@@ -13,7 +14,6 @@ import (
"github.com/containous/traefik/integration/helloworld"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)