Skip to content

Commit

Permalink
Cherry-pick #19106 and #19161 to 7.x: Set ecszap version to v0.2.0 &&…
Browse files Browse the repository at this point in the history 
… fix lint job by updating NOTICE (#19234)

* Set ecszap version to v0.2.0 (#19106)

* Set ecszap version to v0.2.0

* Update go.sum for go.elastic.co/ecszap v0.2.0/

* fix lint job by updating NOTICE (#19161)

Co-authored-by: Steffen Siering <[email protected]>
  • Loading branch information
@cachedout
cachedout and Steffen Siering authored Jun 17, 2020
1 parent a1879cd commit 6b23e5a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7841,8 +7841,7 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: go.elastic.co/ecszap
Version: v0.1.1
Revision: cdd95a104193
Version: v0.2.0
License type (autodetected): Apache-2.0
./vendor/go.elastic.co/ecszap/LICENSE:
--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ require (
go.elastic.co/apm v1.7.2
go.elastic.co/apm/module/apmelasticsearch v1.7.2
go.elastic.co/apm/module/apmhttp v1.7.2
go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193
go.elastic.co/ecszap v0.2.0
go.uber.org/atomic v1.5.0
go.uber.org/multierr v1.3.0
go.uber.org/zap v1.14.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,8 @@ go.elastic.co/apm/module/apmelasticsearch v1.7.2 h1:5STGHLZLSeAzxordMc+dFVKiyVtM
go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod h1:ZyNFuyWdt42GBZkz0SogoLzDBrBGj4orxpiUuxYeYq8=
go.elastic.co/apm/module/apmhttp v1.7.2 h1:2mRh7SwBuEVLmJlX+hsMdcSg9xaielCLElaPn/+i34w=
go.elastic.co/apm/module/apmhttp v1.7.2/go.mod h1:sTFWiWejnhSdZv6+dMgxGec2Nxe/ZKfHfz/xtRM+cRY=
go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193 h1:NjYJ/beChqugXSavTkH5tF6shvr/is8jdgJ331wfwT8=
go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ=
go.elastic.co/ecszap v0.2.0 h1:BSZNJ2MOIsecJ7L4ezUA+JIarx14wclqZLJm/mBj044=
go.elastic.co/ecszap v0.2.0/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ=
go.elastic.co/fastjson v1.0.0 h1:ooXV/ABvf+tBul26jcVViPT3sBir0PvXgibYB1IQQzg=
go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ go.elastic.co/apm/transport/transporttest
go.elastic.co/apm/module/apmelasticsearch
# go.elastic.co/apm/module/apmhttp v1.7.2
go.elastic.co/apm/module/apmhttp
# go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193
# go.elastic.co/ecszap v0.2.0
go.elastic.co/ecszap
go.elastic.co/ecszap/internal
# go.elastic.co/fastjson v1.0.0
Expand Down

0 comments on commit 6b23e5a

Please sign in to comment.