File tree Expand file tree Collapse file tree 6 files changed +2820
-0
lines changed
Expand file tree Collapse file tree 6 files changed +2820
-0
lines changed Original file line number Diff line number Diff line change @@ -1254,11 +1254,19 @@ SOFTWARE
12541254
12551255--------------------------------------------------------------------------------
12561256Dependency : github.com/elastic/elastic-agent-libs
1257+ <<<<<<< HEAD
12571258Version: v0.26.1
12581259Licence type (autodetected): Apache-2.0
12591260--------------------------------------------------------------------------------
12601261
12611262Contents of probable licence file $GOMODCACHE/github.com/elastic/
[email protected] /LICENSE:
1263+ =======
1264+ Version: v0.27.0
1265+ Licence type (autodetected): Apache-2.0
1266+ --------------------------------------------------------------------------------
1267+
1268+ Contents of probable licence file $GOMODCACHE/github.com/elastic/
[email protected] /LICENSE:
1269+ >>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
12621270
12631271 Apache License
12641272 Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -1254,11 +1254,19 @@ SOFTWARE
12541254
12551255--------------------------------------------------------------------------------
12561256Dependency : github.com/elastic/elastic-agent-libs
1257+ <<<<<<< HEAD
12571258Version: v0.26.1
12581259Licence type (autodetected): Apache-2.0
12591260--------------------------------------------------------------------------------
12601261
12611262Contents of probable licence file $GOMODCACHE/github.com/elastic/
[email protected] /LICENSE:
1263+ =======
1264+ Version: v0.27.0
1265+ Licence type (autodetected): Apache-2.0
1266+ --------------------------------------------------------------------------------
1267+
1268+ Contents of probable licence file $GOMODCACHE/github.com/elastic/
[email protected] /LICENSE:
1269+ >>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
12621270
12631271 Apache License
12641272 Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -18,7 +18,11 @@ require (
1818 github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919 github.com/elastic/elastic-agent-autodiscover v0.10.0
2020 github.com/elastic/elastic-agent-client/v7 v7.17.2
21+ <<<<<<< HEAD
2122 github.com/elastic/elastic-agent-libs v0.26.1
23+ =======
24+ github.com/elastic/elastic-agent-libs v0.27.0
25+ >>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
2226 github.com/elastic/elastic-agent-system-metrics v0.13.4
2327 github.com/elastic/elastic-transport-go/v8 v8.8.0
2428 github.com/elastic/go-elasticsearch/v8 v8.19.0
Original file line number Diff line number Diff line change @@ -495,8 +495,13 @@ github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQB
495495github.com/elastic/elastic-agent-autodiscover v0.10.0 /go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE =
496496github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA =
497497github.com/elastic/elastic-agent-client/v7 v7.17.2 /go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk =
498+ <<<<<<< HEAD
498499github.com/elastic/elastic-agent-libs v0.26.1 h1:ywjSQajyjiv7zQTsyZjghIVb7PpPCrXZRUOhbV3KdFM =
499500github.com/elastic/elastic-agent-libs v0.26.1 /go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A =
501+ =======
502+ github.com/elastic/elastic-agent-libs v0.27.0 h1:PV6Hsrj4ZIasSpTWdy7rkQGp1ypNnsRGSqIXVVNnvVY =
503+ github.com/elastic/elastic-agent-libs v0.27.0 /go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ =
504+ >>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
500505github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c =
501506github.com/elastic/elastic-agent-system-metrics v0.13.4 /go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U =
502507github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo =
You can’t perform that action at this time.
0 commit comments