Merge branch v2.3 into master
This commit is contained in:
commit
86c099d629
440 changed files with 5538 additions and 5466 deletions
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016-2020 Containous SAS
|
||||
Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -29,8 +29,8 @@ THE SOFTWARE.
|
|||
package v1alpha1
|
||||
|
||||
import (
|
||||
dynamic "github.com/containous/traefik/v2/pkg/config/dynamic"
|
||||
types "github.com/containous/traefik/v2/pkg/types"
|
||||
dynamic "github.com/traefik/traefik/v2/pkg/config/dynamic"
|
||||
types "github.com/traefik/traefik/v2/pkg/types"
|
||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||
intstr "k8s.io/apimachinery/pkg/util/intstr"
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue