Merge pull request #14581 from dmage/distribution-2299

Merged by openshift-bot
openshift · Jun 13, 2017 · 89fb136 · 89fb136
2 parents 599a720 + f4d649e
commit 89fb136
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 5 deletions.
diff --git a/vendor/github.com/docker/distribution/registry/storage/driver/base/regulator.go b/vendor/github.com/docker/distribution/registry/storage/driver/base/regulator.go
diff --git a/vendor/github.com/docker/distribution/registry/storage/driver/base/regulator_test.go b/vendor/github.com/docker/distribution/registry/storage/driver/base/regulator_test.go