Merge remote-tracking branch 'origin/allyourbaseimage'

Conflicts:
	test/data/test.db
	test/test_api_usage.py
This commit is contained in:
jakedt 2014-02-18 19:15:14 -05:00
commit f4642be11a
126 changed files with 647 additions and 207332 deletions

View file

@ -272,7 +272,7 @@ sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
</span>?
<div ng-show="tagSpecificImages(tagToDelete).length" style="margin-top: 20px">
The following images will also be deleted:
The following images and any other images not referenced by a tag will be deleted:
<div class="image-listings">
<div class="image-listing" ng-repeat="image in tagSpecificImages(tagToDelete) | limitTo:5"
ng-class="getImageListingClasses(image, tagToDelete)">