Skip to content

Commit 0cdbd27

Browse files
committed
fix conflicts
1 parent 7833bbc commit 0cdbd27

3 files changed

Lines changed: 4 additions & 19 deletions

File tree

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,11 +1063,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-a
10631063

10641064
--------------------------------------------------------------------------------
10651065
Dependency : github.com/elastic/elastic-agent-client/v7
1066-
Version: v7.17.0
1066+
Version: v7.17.1
10671067
Licence type (autodetected): Elastic
10681068
--------------------------------------------------------------------------------
10691069

1070-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.17.0/LICENSE.txt:
1070+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.17.1/LICENSE.txt:
10711071

10721072
ELASTIC LICENSE AGREEMENT
10731073

@@ -1507,11 +1507,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
15071507

15081508
--------------------------------------------------------------------------------
15091509
Dependency : github.com/elastic/elastic-agent-system-metrics
1510-
Version: v0.11.7
1510+
Version: v0.11.8
15111511
Licence type (autodetected): Apache-2.0
15121512
--------------------------------------------------------------------------------
15131513

1514-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.7/LICENSE.txt:
1514+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.8/LICENSE.txt:
15151515

15161516
Apache License
15171517
Version 2.0, January 2004

go.mod

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@ require (
1414
github.com/docker/go-units v0.5.0
1515
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
1616
github.com/elastic/elastic-agent-autodiscover v0.9.0
17-
<<<<<<< HEAD
18-
github.com/elastic/elastic-agent-client/v7 v7.17.0
19-
github.com/elastic/elastic-agent-libs v0.18.2
20-
github.com/elastic/elastic-agent-system-metrics v0.11.7
21-
=======
2217
github.com/elastic/elastic-agent-client/v7 v7.17.1
2318
github.com/elastic/elastic-agent-libs v0.18.8
2419
github.com/elastic/elastic-agent-system-metrics v0.11.8
25-
>>>>>>> f34071c29 (chore: update elastic-agent-libs to v0.18.8 (#6938))
2620
github.com/elastic/elastic-transport-go/v8 v8.6.1
2721
github.com/elastic/go-elasticsearch/v8 v8.17.1
2822
github.com/elastic/go-licenser v0.4.2

go.sum

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,21 +316,12 @@ github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z
316316
github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
317317
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
318318
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
319-
<<<<<<< HEAD
320-
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
321-
github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
322-
github.com/elastic/elastic-agent-libs v0.18.2 h1:jQrGytcG67YEhK9JzUhM1Yb6j9Ied68iYrWK8mlIV5M=
323-
github.com/elastic/elastic-agent-libs v0.18.2/go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U=
324-
github.com/elastic/elastic-agent-system-metrics v0.11.7 h1:1xm2okCM0eQZ4jivZgUFSlt6HAn/nPgKB/Fj8eLG6mY=
325-
github.com/elastic/elastic-agent-system-metrics v0.11.7/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI=
326-
=======
327319
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0=
328320
github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM=
329321
github.com/elastic/elastic-agent-libs v0.18.8 h1:YCokiu33g0A5Glz+iizexgrv86ftItK7ono4RfNRdRw=
330322
github.com/elastic/elastic-agent-libs v0.18.8/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM=
331323
github.com/elastic/elastic-agent-system-metrics v0.11.8 h1:O12rj3Gojqa9UX8gA6Dj1XDIGeZXgXOAvxQbvC+XLbA=
332324
github.com/elastic/elastic-agent-system-metrics v0.11.8/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag=
333-
>>>>>>> f34071c29 (chore: update elastic-agent-libs to v0.18.8 (#6938))
334325
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
335326
github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
336327
github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfyipwsOCWAlO+ju3xXC61Z4prx/HBTtFk=

0 commit comments

Comments
 (0)