Merge cleanly cherry-pickable upstream commits
Context
This issue serves as a way to organize the inclusion of easy to incorporate commits present in upstream master that are not present on the release branch. These commits have only been filtered by ease of work, individual commits may no longer be appropriate or applicable.
upstream/master
not present in release/2.8-gitlab
with cherry-pick cleanly
Commits in Please link the related MR when you start working in porting one of these changes.
Upstream Commit | Subject | Effort to Merge | Merge Request | Cherry-Picks Cleanly | Files Changed | Insertions | Deletions |
---|---|---|---|---|---|---|---|
74d442a0 Upstream | Consider redis.ErrNil as distribution.ErrBlobUnknown for Stat HGET | Undetermined | !288 (merged) | Y | 2 files changed | 8 insertions(+) | |
79589266 Upstream | redis metrics | Undetermined | !288 (merged) | Y | 2 files changed | 76 insertions(+) | 3 deletions(-) |
4c7c63b5 Upstream | Add cache unit test | Undetermined | !288 (merged) | Y | 1 file changed | 131 insertions(+) | |
db3c418a Upstream | Update reporting issues guidelines | Undetermined | Y | 1 file changed | 6 insertions(+) | 5 deletions(-) | |
f5e84a49 Upstream | Update readme and contributing docs | Undetermined | Y | 3 files changed | 48 insertions(+) | 158 deletions(-) | |
c9c33243 Upstream | Add unit tests for BlobEnumerator | Undetermined | Y | 2 files changed | 53 insertions(+) | ||
fa7d9494 Upstream | allow Repository.BlobStore to enumerate over blobs | Undetermined | Y | 1 file changed | 1 insertion(+) | ||
cf771137 Upstream | add pathspec for repo _layers directory | Undetermined | Y | 1 file changed | 10 insertions(+) | ||
cc97b94f Upstream | use travis, not circle, build badge | Undetermined | Y | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
1c481d34 Upstream | registry: Fix typo in RepositoryRemover warning | Fixed already | Y | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
c486db2d Upstream | make it possible to wrap the client transport in another one | Undetermined | Y | 1 file changed | 12 insertions(+) | 4 deletions(-) | |
92d213d2 Upstream | allow for VERSION and REVISION to be passed in during docker builds | Undetermined | Y | 2 files changed | 4 insertions(+) | 2 deletions(-) | |
3800c47f Upstream | Implement Repository ServeBlob | Undetermined | Y | 2 files changed | 71 insertions(+) | 1 deletion(-) | |
8b31a894 Upstream | deduce blob UUID from location if it wasn't provided in the headers | Undetermined | Y | 2 files changed | 111 insertions(+) | ||
b23dd1ef Upstream | swift: correct segment path generation | Undetermined | !313 (merged) | Y | 2 files changed | 42 insertions(+) | 3 deletions(-) |
0e2d080a Upstream | append the written bytes to the blob writer's size | Undetermined | Y | 2 files changed | 90 insertions(+) | 2 deletions(-) | |
5afbf324 Upstream | fix no error returned in fetchTokenWithOAuth | Undetermined | !364 (merged) | Y | 1 file changed | 4 insertions(+) | |
74f429a5 Upstream | Fix typo: offest -> offset | Undetermined | !120 (merged) | Y | 2 files changed | 2 insertions(+) | 2 deletions(-) |
51bb5cee Upstream | import alicdn package | Undetermined | Y | 1 file changed | 1 insertion(+) | ||
e1e72e95 Upstream | Fix cloudfront documentation formatting | Undetermined | Y | 1 file changed | 10 insertions(+) | 5 deletions(-) | |
f9a05061 Upstream | Bugfix: Make ipfilteredby not required | Undetermined | !363 (merged) | Y | 1 file changed | 24 insertions(+) | 18 deletions(-) |
a683c7c2 Upstream | Fixes #2835 Process Accept header MIME types in case-insensitive way | Undetermined | !121 (merged) | Y | 1 file changed | 3 insertions(+) | 6 deletions(-) |
228bafca Upstream | run go fmt | Undetermined | Y | 3 files changed | 15 insertions(+) | 15 deletions(-) | |
8b706168 Upstream | Add notification metrics | Undetermined | !122 (merged) | Y | 2 files changed | 31 insertions(+) | |
ec6566c0 Upstream | Log authorized username | Undetermined | !123 (merged) | Y | 1 file changed | 1 insertion(+) | 1 deletion(-) |
3aa2a282 Upstream | support alicdn middleware | Undetermined | Y | 6 files changed | 378 insertions(+) | ||
15b02047 Upstream | registry: fix binary JSON content-type | Undetermined | !314 (merged) | Y | 12 files changed | 135 insertions(+) | 135 deletions(-) |
cdb62b2b Upstream | Registry - make minimum TLS version user configurable | Undetermined | !114 (merged) | Y | 4 files changed | 26 insertions(+) | 3 deletions(-) |
7df881dc Upstream | change default Dockerfile to install ssl utils | Undetermined | !113 (merged) | Y | 1 file changed | 5 insertions(+) | 1 deletion(-) |
0ac367fd Upstream | Add reference.ParseDockerRef utility function | Undetermined | !112 (closed) | Y | 2 files changed | 109 insertions(+) | |
b7839211 Upstream | Update doc for BYOK support in OSS storage driver | Undetermined | !110 (merged) | Y | 1 file changed | 4 insertions(+) | 2 deletions(-) |
90bed671 Upstream | Support BYOK for OSS storage driver | Undetermined | !110 (merged) | Y | 15 files changed | 1212 insertions(+) | 106 deletions(-) |
e6983745 Upstream | Add tests for configuration parser | Undetermined | !109 (merged) | Y | 1 file changed | 70 insertions(+) | |
c9eba1a5 Upstream | Fix the pointer initialization | Undetermined | !108 (merged) | Y | 1 file changed | 1 insertion(+) | 1 deletion(-) |
Generated with:
git cherry-pick --quit >/dev/null 2>&1; git log --oneline --no-merges upstream/master ^release/2.8-gitlab | cut -d" " -f1 | xargs -d $'\n' sh -c 'for arg do git show --format="|%h [Upstream](https://github.com/docker/distribution/commit/%H)|%s|Undetermined|N/A|" -s "$arg" | tr -d "\n" ; git cherry-pick $arg > /dev/null 2>&1; rebase_rc=$? ; git cherry-pick --quit > /dev/null 2>&1; git reset --hard release/2.8-gitlab > /dev/null 2>&1; printf $rebase_rc\| | tr 01 YN; git diff --shortstat "$arg"^ "$arg" | sed "s/, /\|/g"; done' | awk -F"|" 'BEGIN{ OFS="|"; ORS="|\n"} { if ($6 == "Y") print $0 }' | sed "s/Undetermined/Trivial/g"
Edited by Hayley Swimelar