diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-11 02:25:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 02:25:41 -0800 |
| commit | 26f2b7debde313af4a5ae39727c66a3f8fd59be4 (patch) | |
| tree | 1ab2968feabc60768ac04c7f832ddfb93f97e3ad /vendor.conf | |
| parent | 36d96c19f947aeac2675afe64a3b482e54f9e4c4 (diff) | |
| parent | 3966d3bf4e6be2975c330af64ce6ba86b4eeabe0 (diff) | |
| download | podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.tar.gz podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.tar.bz2 podman-26f2b7debde313af4a5ae39727c66a3f8fd59be4.zip | |
Merge pull request #2105 from mheon/jsoniter
Use jsoniter instead of easyjson
Diffstat (limited to 'vendor.conf')
| -rw-r--r-- | vendor.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf index 18283cae6..c2700c82c 100644 --- a/vendor.conf +++ b/vendor.conf @@ -41,7 +41,7 @@ github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55 github.com/hashicorp/go-multierror 83588e72410abfbe4df460eeb6f30841ae47d4c4 github.com/hashicorp/golang-lru 0a025b7e63adc15a622f29b0b2c4c3848243bbf6 github.com/imdario/mergo 0.2.2 -github.com/json-iterator/go 1.0.0 +github.com/json-iterator/go 1.1.5 github.com/kr/pty v1.0.0 github.com/mattn/go-runewidth v0.0.1 github.com/mistifyio/go-zfs v2.1.1 @@ -97,10 +97,11 @@ github.com/Nvveen/Gotty master github.com/fsouza/go-dockerclient master github.com/openshift/imagebuilder master github.com/ulikunitz/xz v0.5.4 -github.com/mailru/easyjson 03f2033d19d5860aef995fe360ac7d395cd8ce65 github.com/coreos/go-iptables 25d087f3cffd9aedc0c2b7eff25f23cbf3c20fe1 github.com/google/shlex c34317bd91bf98fab745d77b03933cf8769299fe github.com/pkg/profile v1.2.1 github.com/klauspost/pgzip v1.2.1 github.com/klauspost/compress v1.4.1 github.com/klauspost/cpuid v1.2.0 +github.com/modern-go/reflect2 1.0.1 +github.com/modern-go/concurrent 1.0.3
\ No newline at end of file |