Skip to content

Spelling corrections#805

Merged
stevvooe merged 2 commits intodistribution:masterfrom
RichardScothern:811
Aug 4, 2015
Merged

Spelling corrections#805
stevvooe merged 2 commits intodistribution:masterfrom
RichardScothern:811

Conversation

@RichardScothern
Copy link
Copy Markdown

Signed-off-by: Richard Scothern richard.scothern@gmail.com

closes #804

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
@stevvooe
Copy link
Copy Markdown
Collaborator

stevvooe commented Aug 3, 2015

This is still causing a diff after make docs/spec/api.md:

diff --git a/docs/spec/api.md b/docs/spec/api.md
index c573178..12c1043 100644
--- a/docs/spec/api.md
+++ b/docs/spec/api.md
@@ -175,7 +175,6 @@ identify a set of modifications.
       <li>Added error code for unsupported operations.</li>
     </ul>
   </dd>
-
 </dl>

 ## Overview
@@ -727,7 +726,8 @@ delete may be issued with the following request format:

     DELETE /v2/<name>/blobs/<digest>

-If the blob exists and has been successfully deleted, the following response will be issued:
+If the blob exists and has been successfully deleted, the following response
+will be issued:

     202 Accepted
     Content-Length: None
@@ -735,6 +735,8 @@ If the blob exists and has been successfully deleted, the following response wil
 If the blob had already been deleted or did not exist, a `404 Not Found`
 response will be issued instead.

+If a layer is deleted which is referenced by a manifest in the registry,
+then the complete images will not be resolvable.

 #### Pushing an Image Manifest

@@ -1022,7 +1024,6 @@ A list of methods and URIs are covered in the table below:
 | PUT | `/v2/<name>/blobs/uploads/<uuid>` | Blob Upload | Complete the upload specified by `uuid`, optionally appending the body as the final chunk. |
 | DELETE | `/v2/<name>/blobs/uploads/<uuid>` | Blob Upload | Cancel outstanding upload processes, releasing associated resources. If this is not called, the unfinished uploads will eventually timeout. |
 | GET | `/v2/_catalog` | Catalog | Retrieve a sorted, json list of repositories available in the registry. |
-| DELETE | `/v2/<name>/blobs/<digest>` | Blob delete | Delete the blob identified by `name` and `digest`|


 The detail for each endpoint is covered in the following sections.
@@ -1732,7 +1733,6 @@ The error codes that may be included in the response body are enumerated below:

 #### DELETE Manifest

-
 Delete the manifest identified by `name` and `reference`. Note that a manifest can _only_ be deleted by `digest`.

@RichardScothern RichardScothern changed the title Speeling corrections Spelling corrections Aug 3, 2015
@dmp42 dmp42 added this to the Registry/2.1 milestone Aug 3, 2015
@RichardScothern
Copy link
Copy Markdown
Author

I see. descriptors.go is missing a section.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
@RichardScothern
Copy link
Copy Markdown
Author

descriptors.go has been updated. PTAL @stevvooe

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: I don't think we return UNSUPPORTED on method not allowed.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed:

curl -X DELETE http://localhost:5000/v2/mongo/blobs/sha256:5edccc13a9bd6722232ab891591bf3d19876c60787dce4e091f29bdf60192e98 
{"errors":[{"code":"UNSUPPORTED","message":"The operation is unsupported."}]}

@stevvooe
Copy link
Copy Markdown
Collaborator

stevvooe commented Aug 4, 2015

@RichardScothern Do we know why this dropped out? I am fairly sure we merged this correctly.

@stevvooe
Copy link
Copy Markdown
Collaborator

stevvooe commented Aug 4, 2015

LGTM

@RichardScothern
Copy link
Copy Markdown
Author

It's not clear from git log what happened. It's possible it was in the first soft-delete PR (with tombstones), but missed from the link-removal version.

stevvooe added a commit that referenced this pull request Aug 4, 2015
@stevvooe stevvooe merged commit ef1c72b into distribution:master Aug 4, 2015
@RichardScothern RichardScothern deleted the 811 branch October 30, 2015 21:33
thaJeztah pushed a commit to thaJeztah/distribution that referenced this pull request Apr 22, 2021
thaJeztah pushed a commit to thaJeztah/distribution that referenced this pull request Jan 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Please fix bad merge from #801

5 participants