File tree 5 files changed +31
-0
lines changed
5 files changed +31
-0
lines changed Original file line number Diff line number Diff line change @@ -661,11 +661,19 @@ SOFTWARE
661
661
662
662
--------------------------------------------------------------------------------
663
663
Dependency : github.com/elastic/elastic-agent-libs
664
+ <<<<<<< HEAD
664
665
Version: v0.18.6
665
666
Licence type (autodetected): Apache-2.0
666
667
--------------------------------------------------------------------------------
667
668
668
669
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.6/LICENSE:
670
+ =======
671
+ Version: v0.18.10
672
+ Licence type (autodetected): Apache-2.0
673
+ --------------------------------------------------------------------------------
674
+
675
+ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.10/LICENSE:
676
+ >>>>>>> c016c0e (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565))
669
677
670
678
Apache License
671
679
Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -7,8 +7,13 @@ require (
7
7
github.com/dgraph-io/ristretto v0.2.0
8
8
github.com/docker/go-units v0.5.0
9
9
github.com/elastic/elastic-agent-client/v7 v7.17.1
10
+ <<<<<<< HEAD
10
11
github.com/elastic/elastic-agent-libs v0.18.6
11
12
github.com/elastic/elastic-agent-system-metrics v0.11.8
13
+ =======
14
+ github.com/elastic/elastic-agent-libs v0.18.10
15
+ github.com/elastic/elastic-agent-system-metrics v0.11.9
16
+ >>>>>>> c016c0e (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565))
12
17
github.com/elastic/go-elasticsearch/v8 v8.17.1
13
18
github.com/elastic/go-ucfg v0.8.8
14
19
github.com/fxamacker/cbor/v2 v2.6.0
Original file line number Diff line number Diff line change @@ -33,10 +33,17 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
33
33
github.com/dustin/go-humanize v1.0.1 /go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto =
34
34
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0 =
35
35
github.com/elastic/elastic-agent-client/v7 v7.17.1 /go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM =
36
+ <<<<<<< HEAD
36
37
github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw =
37
38
github.com/elastic/elastic-agent-libs v0.18.6 /go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno =
38
39
github.com/elastic/elastic-agent-system-metrics v0.11.8 h1:O12rj3Gojqa9UX8gA6Dj1XDIGeZXgXOAvxQbvC+XLbA =
39
40
github.com/elastic/elastic-agent-system-metrics v0.11.8 /go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag =
41
+ =======
42
+ github.com/elastic/elastic-agent-libs v0.18.10 h1:ZmO8ihcWhULEyUA+9WyQR5W1+wxkTPOGiwLlqPy7s7I =
43
+ github.com/elastic/elastic-agent-libs v0.18.10 /go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM =
44
+ github.com/elastic/elastic-agent-system-metrics v0.11.9 h1:UDgT4ygXKGRwyNyUDzBKbDW7bYphZNg1GOLtDFqZ4Wg =
45
+ github.com/elastic/elastic-agent-system-metrics v0.11.9 /go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag =
46
+ >>>>>>> c016c0e (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565))
40
47
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4 =
41
48
github.com/elastic/elastic-transport-go/v8 v8.6.1 /go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk =
42
49
github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q =
Original file line number Diff line number Diff line change @@ -33,7 +33,11 @@ require (
33
33
github.com/distribution/reference v0.5.0 // indirect
34
34
github.com/docker/go-connections v0.5.0 // indirect
35
35
github.com/docker/go-units v0.5.0 // indirect
36
+ <<<<<<< HEAD
36
37
github.com/elastic/elastic-agent-libs v0.18.6 // indirect
38
+ =======
39
+ github.com/elastic/elastic-agent-libs v0.18.10 // indirect
40
+ >>>>>>> c016c0e (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565))
37
41
github.com/felixge/httpsnoop v1.0.4 // indirect
38
42
github.com/go-logr/logr v1.4.2 // indirect
39
43
github.com/go-logr/stdr v1.2.2 // indirect
Original file line number Diff line number Diff line change @@ -39,10 +39,17 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
39
39
github.com/docker/go-units v0.5.0 /go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk =
40
40
github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0 =
41
41
github.com/elastic/elastic-agent-client/v7 v7.17.1 /go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM =
42
+ <<<<<<< HEAD
42
43
github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw =
43
44
github.com/elastic/elastic-agent-libs v0.18.6 /go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno =
44
45
github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw =
45
46
github.com/elastic/go-sysinfo v1.15.0 /go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk =
47
+ =======
48
+ github.com/elastic/elastic-agent-libs v0.18.10 h1:ZmO8ihcWhULEyUA+9WyQR5W1+wxkTPOGiwLlqPy7s7I =
49
+ github.com/elastic/elastic-agent-libs v0.18.10 /go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM =
50
+ github.com/elastic/go-sysinfo v1.15.1 h1:zBmTnFEXxIQ3iwcQuk7MzaUotmKRp3OabbbWM8TdzIQ =
51
+ github.com/elastic/go-sysinfo v1.15.1 /go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk =
52
+ >>>>>>> c016c0e (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.8 to 0.18.10 (#4565))
46
53
github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk =
47
54
github.com/elastic/go-ucfg v0.8.8 /go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA =
48
55
github.com/elastic/go-windows v1.0.2 h1:yoLLsAsV5cfg9FLhZ9EXZ2n2sQFKeDYrHenkcivY4vI =
You can’t perform that action at this time.
0 commit comments