diff --git a/NOTICE.txt b/NOTICE.txt index 89a6a2a164a..a85d3784ff2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1264,11 +1264,19 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs +<<<<<<< HEAD Version: v0.10.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.10.0/LICENSE: +======= +Version: v0.11.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.11.0/LICENSE: +>>>>>>> 0ebadad3b0 (build(deps): bump github.com/elastic/elastic-agent-libs (#5559)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index e66fa130a62..ae55074f0b8 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,11 @@ require ( github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5 github.com/elastic/elastic-agent-autodiscover v0.8.2 github.com/elastic/elastic-agent-client/v7 v7.16.0 +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.10.0 +======= + github.com/elastic/elastic-agent-libs v0.11.0 +>>>>>>> 0ebadad3b0 (build(deps): bump github.com/elastic/elastic-agent-libs (#5559)) github.com/elastic/elastic-agent-system-metrics v0.11.2 github.com/elastic/elastic-transport-go/v8 v8.6.0 github.com/elastic/go-elasticsearch/v8 v8.15.0 diff --git a/go.sum b/go.sum index fee06803da8..4d9f57156f5 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,13 @@ github.com/elastic/elastic-agent-autodiscover v0.8.2 h1:Fs2FhR33AMBPfm5/jz4drVza github.com/elastic/elastic-agent-autodiscover v0.8.2/go.mod h1:VZnU53EVaFTxR8Xf6YsLN8FHD5DKQzHSPlKax9/4w+o= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.10.0 h1:W7uvay0UYdLPtauXGsMD8Xfoe4qtcVWQR4icBgf/26Q= github.com/elastic/elastic-agent-libs v0.10.0/go.mod h1:2VgYxHaeM+cCDBjiS2wbmTvzPGbnlXAtYrlcLefheS8= +======= +github.com/elastic/elastic-agent-libs v0.11.0 h1:m9rnNE3BkBF2XJoqubqEbu/kbtKEBZ7pHCjDlxfVRH0= +github.com/elastic/elastic-agent-libs v0.11.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +>>>>>>> 0ebadad3b0 (build(deps): bump github.com/elastic/elastic-agent-libs (#5559)) github.com/elastic/elastic-agent-system-metrics v0.11.2 h1:UjSBcY6U3H3venB5zAPEFNjAb4Bb38EiVqaA4zALEnM= github.com/elastic/elastic-agent-system-metrics v0.11.2/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=