From 75709deb6f7356f702deb8437a1d2fc5a2762fde Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 23 Jun 2021 13:02:34 +0300 Subject: [PATCH] Revert "go.mod/spf13: Bump versions" This reverts commit fc2fc9a4f4ed8b93031fc31754f04772bffde6ae. go1.14 fails `make build*` command. Go version should be updated. Signed-off-by: Alex Vanin --- go.mod | 6 +++--- go.sum | Bin 90471 -> 63925 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ba5c707a7..392c2e226 100644 --- a/go.mod +++ b/go.mod @@ -18,9 +18,9 @@ require ( github.com/panjf2000/ants/v2 v2.4.0 github.com/paulmach/orb v0.2.2 github.com/prometheus/client_golang v1.11.0 - github.com/spf13/cast v1.3.1 - github.com/spf13/cobra v1.1.3 - github.com/spf13/viper v1.8.0 + github.com/spf13/cast v1.3.0 + github.com/spf13/cobra v1.0.0 + github.com/spf13/viper v1.7.0 github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.5 go.uber.org/atomic v1.8.0 diff --git a/go.sum b/go.sum index e301bd543c887ac2840b78957ef5e49cc04e6453..9cc8448f03c329e978233af0b3d954df5608f846 100644 GIT binary patch delta 1747 zcmY+Ed5jxZ9mnc>hGK)Ole6%t2?5Sc&B7NQ0@SC@!7J0#@S?p1P=7p1G9Ft__3|4tN0|U5=*un=djXtim|$>WQagf>1Lf?e%Nzq8Md9^ zGAm70OLPJWDqzaKFud))AHM8ffX`De!=KXA=yCcnJ6u1y3zd()4&eIn+i-)KK}Dtn z&>+yZBbEc>@ab3<-Qdpv_^HGjh)rkhH0CNd=If2pHW*7cL%}Rn$I}t7w@qfuc(W4K z6Cn|+s7$=aHyGX^viX{Bi13o~0Q$D_O90R#6n@6ax-uMgU~C}j%?Oj>Xj z(&3=X+lllOB{tU%dr2k`hDX;9K-*gENHO2;+}p$F$$4zMNTaNFT&{pDu#KSFZ;C7Z z7RKt-Kp&LNCTH}@>(P(^piHj(1XKKBcy_sL+-@vM1=xmqSXh znjbD0W%!BBLvVaE0-riN1#fJoz3%@5NTeck&Q)u+iE9;6=7-PPpz?egj=#XeL+9^A=U@1d4Sw#zDop2S3-7l`e&Ey zsQ>Gyx8B%qEx7uJIrQ1f&GCH{LEseS#p#DNlEAPMPOF%YfRk5c^p7jY0Nnhe3BU6v z9lrMG{qKD$o~9tG9Mz5Kepf};`?^}{YkGVEtCaNw&kqD#YJ?Rr9)`>thqiQ&z^`1} zjlT8QBLIHsZ@baOx1X@V2d}>Zm;OD2D(_sMgcont;naVA0XJ@6{^~oxuvTqb$4AD& zZ>&ob;8)h`4p6s_&48a&vs?>}YKc>;XG{iVZ_3G0sT6N+lwk605~(H8EMv zR?7^lg_H=xN+Frg2a1GYo!$-Zvd-@UoONwC_?`9YKCo-_$-Uriheh2DD%KC~1E%%l zN5M(!_(NdN=$nVZi+1Y*38qI=1Xu(XMuR&>pLc@;W7gkKfV+0$ody@G;rVL8)hzb& zQWXyrn*JQ#GH_qZOY!lv<_+cjb?z>^%tlN!|%bvo9KwAfTnmm3{2N2xWR YscGp>+WOieSQ?#v1o-UMa0y8N1;)d3@c;k- delta 17496 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