Merge current v2.6 into master
This commit is contained in:
commit
25725e9b2f
45 changed files with 155 additions and 99 deletions
|
@ -46,7 +46,6 @@ func TestRuntimeConfiguration(t *testing.T) {
|
|||
},
|
||||
"bar": {
|
||||
UDPRouter: &dynamic.UDPRouter{
|
||||
|
||||
EntryPoints: []string{"web"},
|
||||
Service: "foo-service",
|
||||
},
|
||||
|
@ -78,7 +77,6 @@ func TestRuntimeConfiguration(t *testing.T) {
|
|||
},
|
||||
"bar": {
|
||||
UDPRouter: &dynamic.UDPRouter{
|
||||
|
||||
EntryPoints: []string{"web"},
|
||||
Service: "foo-service",
|
||||
},
|
||||
|
|
|
@ -86,7 +86,7 @@ func (b *Balancer) Push(x interface{}) {
|
|||
b.handlers = append(b.handlers, h)
|
||||
}
|
||||
|
||||
// Pop implements heap.Interface for poping an item from the heap.
|
||||
// Pop implements heap.Interface for popping an item from the heap.
|
||||
// It panics if b.Len() < 1.
|
||||
func (b *Balancer) Pop() interface{} {
|
||||
h := b.handlers[len(b.handlers)-1]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue