Merge branch 'v1.5' into master
This commit is contained in:
commit
a2db3e0499
18 changed files with 684 additions and 486 deletions
|
@ -1,6 +1,7 @@
|
|||
package docker
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
@ -11,7 +12,6 @@ import (
|
|||
"github.com/docker/docker/api/types/swarm"
|
||||
dockerclient "github.com/docker/docker/client"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
type fakeTasksClient struct {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue