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

Merge remote-tracking branch 'origin/master' into pullinprivate

Browse source 
Conflicts:
	workers/dockerfilebuild.py
This commit is contained in:
jakedt 2014-03-31 18:10:34 -04:00
commit d67a1cddc2
14 changed files with 96 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/model/legacy.py
View file

@ -1029,7 +1029,7 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name,
except Image.DoesNotExist:
raise DataModelException('No image with specified id and repository')
fetched.storage.created = dateutil.parser.parse(created_date_str)
fetched.storage.created = dateutil.parser.parse(created_date_str).replace(tzinfo=None)
fetched.storage.comment = comment
fetched.storage.command = command