vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for hard merge

Browse source
This commit is contained in:
Joseph Schorr 2017-07-17 16:36:05 +03:00
parent a8b340feb6
commit 9679ec91ec
6 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
endpoints/v2/manifest.py
View file

@ -17,7 +17,6 @@ from endpoints.v2.models_interface import Label
from endpoints.v2.models_pre_oci import data_model as model
from endpoints.v2.errors import (BlobUnknown, ManifestInvalid, ManifestUnknown, TagInvalid,
NameInvalid, TagExpired)
>>>>>>> Change error message when trying to pull a deleted or expired tag
from endpoints.v2.labelhandlers import handle_label
from image.docker import ManifestException
from image.docker.schema1 import DockerSchema1Manifest, DockerSchema1ManifestBuilder