Skip to content

Commit 8892d75

Browse files
author
Flavio Crisciani
authored
Merge pull request #2111 from thaJeztah/fix-golang-sync-canonical-import
Fix golang.org/x/sync canonical import path
2 parents 2112cac + 756b2d6 commit 8892d75

6 files changed

Lines changed: 2 additions & 3 deletions

File tree

‎ipam/parallel_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import (
77
"sync"
88
"testing"
99

10-
"github.com/golang/sync/semaphore"
11-
1210
"github.com/docker/libnetwork/ipamapi"
1311
"github.com/stretchr/testify/assert"
12+
"golang.org/x/sync/semaphore"
1413
)
1514

1615
const (

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
5050
golang.org/x/crypto 558b6879de74bc843225cde5686419267ff707ca
5151
golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
5252
golang.org/x/sys 07c182904dbd53199946ba614a412c61d3c548f5
53-
github.com/golang/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
53+
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
5454
github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
5555
github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb

vendor/github.com/golang/sync/LICENSE renamed to vendor/golang.org/x/sync/LICENSE

File renamed without changes.

vendor/github.com/golang/sync/PATENTS renamed to vendor/golang.org/x/sync/PATENTS

File renamed without changes.

vendor/github.com/golang/sync/README.md renamed to vendor/golang.org/x/sync/README.md

File renamed without changes.

vendor/github.com/golang/sync/semaphore/semaphore.go renamed to vendor/golang.org/x/sync/semaphore/semaphore.go

File renamed without changes.

0 commit comments

Comments
 (0)