Merge branch 'main' into upstream_access_revocation_during_gc

This commit is contained in:
Ryan Richard 2021-12-06 14:47:27 -08:00
commit c9c218fdf0
2 changed files with 2 additions and 1 deletions

View File

@ -3,7 +3,7 @@
# Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
FROM golang:1.17.3 as build-env
FROM golang:1.17.4 as build-env
WORKDIR /work
COPY . .

1
go.mod
View File

@ -137,6 +137,7 @@ require (
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.2 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/grpc v1.38.0 // indirect