Merge master into breakout_swarm

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2018-02-01 09:25:39 +00:00
parent afeb7bbce4
commit f954bf0733
1953 changed files with 614131 additions and 175582 deletions

View File

@ -5,7 +5,7 @@ import (
"fmt"
"strings"
"github.com/opencontainers/go-digest"
"github.com/docker/distribution/digest"
)
// ErrAccessDenied is returned when an access to a requested resource is
@ -77,7 +77,7 @@ func (err ErrManifestUnknownRevision) Error() string {
type ErrManifestUnverified struct{}
func (ErrManifestUnverified) Error() string {
return "unverified manifest"
return fmt.Sprintf("unverified manifest")
}
// ErrManifestVerification provides a type to collect errors encountered