refreshed godep since some PRs are still coming into master branch

This commit is contained in:
Brad Rydzewski
2014-09-23 23:51:29 -07:00
parent 9fcec0025d
commit 2523c82d33
394 changed files with 36704 additions and 31828 deletions

View File

@@ -13,6 +13,7 @@ import (
"os"
"strings"
"github.com/dotcloud/docker/pkg/stdcopy"
"github.com/dotcloud/docker/pkg/term"
"github.com/dotcloud/docker/utils"
)
@@ -191,7 +192,7 @@ func (c *Client) hijack(method, path string, setRawTerminal bool, out io.Writer)
if setRawTerminal {
_, err = io.Copy(out, br)
} else {
_, err = utils.StdCopy(out, out, br)
_, err = stdcopy.StdCopy(out, out, br)
}
errStdout <- err

View File

@@ -10,7 +10,7 @@ import (
"time"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/utils"
"github.com/dotcloud/docker/pkg/parsers"
)
type Images struct {
@@ -63,7 +63,7 @@ func (c *ImageService) Create(image string) error {
}
func (c *ImageService) Pull(image string) error {
name, tag := utils.ParseRepositoryTag(image)
name, tag := parsers.ParseRepositoryTag(image)
if len(tag) == 0 {
tag = DEFAULTTAG
}