Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 1255e0d

Browse files
author
Ian Campbell
committed
Switch back to duffle master.
Since cnabio/duffle#664 is now merged. Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 4b4cfa0 commit 1255e0d

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

‎Gopkg.lock‎

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ required = ["github.com/wadey/gocovmerge"]
4040
name = "github.com/docker/cli"
4141
branch = "master"
4242

43-
# Waiting for https://github.com/deislabs/duffle/pull/664 to be merged
4443
[[override]]
4544
name = "github.com/deislabs/duffle"
46-
source = "github.com/silvin-lubecki/duffle"
47-
branch = "docker-app"
45+
branch = "master"
4846

4947
[[constraint]]
5048
name = "github.com/sirupsen/logrus"

‎vendor/github.com/deislabs/duffle/pkg/bundle/parameters.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/deislabs/duffle/pkg/driver/docker_driver.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)