Merge remote-tracking branch 'origin/spartan'

Conflicts:
	test/data/test.db

endpoints/api.py

@@ -1159,6 +1159,24 @@ def get_image_changes(namespace, repository, image_id):
   abort(403)
 
 
+@app.route('/api/repository/<path:repository>/tag/<tag>',
+           methods=['DELETE'])
+@parse_repository_name
+def delete_full_tag(namespace, repository, tag):
+  permission = AdministerRepositoryPermission(namespace, repository)
+  if permission.can():
+    model.delete_tag_and_images(namespace, repository, tag)
+
+    username = current_user.db_user().username
+    log_action('delete_tag', namespace,
+               {'username': username, 'repo': repository, 'tag': tag},
+               repo=model.get_repository(namespace, repository))
+
+    return make_response('Deleted', 204)
+
+  abort(403)  # Permission denied
+
+
 @app.route('/api/repository/<path:repository>/tag/<tag>/images',
            methods=['GET'])
 @parse_repository_name

endpoints/index.py

@@ -158,10 +158,6 @@ def create_repository(namespace, repository):
   for existing in model.get_repository_images(namespace, repository):
     if existing.docker_image_id in new_repo_images:
       added_images.pop(existing.docker_image_id)
-    else:
-      logger.debug('Deleting existing image with id: %s' %
-                   existing.docker_image_id)
-      existing.delete_instance(recursive=True)
 
   for image_description in added_images.values():
     model.create_image(image_description['id'], repo)