File tree 5 files changed +34
-0
lines changed
5 files changed +34
-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.1
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.1/LICENSE:
670
+ =======
671
+ Version: v0.18.6
672
+ Licence type (autodetected): Apache-2.0
673
+ --------------------------------------------------------------------------------
674
+
675
+ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.6/LICENSE:
676
+ >>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436))
669
677
670
678
Apache License
671
679
Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -8,9 +8,15 @@ require (
8
8
github.com/Pallinder/go-randomdata v1.2.0
9
9
github.com/dgraph-io/ristretto v0.2.0
10
10
github.com/docker/go-units v0.5.0
11
+ <<<<<<< HEAD
11
12
github.com/elastic/elastic-agent-client/v7 v7.17.0
12
13
github.com/elastic/elastic-agent-libs v0.18.1
13
14
github.com/elastic/elastic-agent-system-metrics v0.11.7
15
+ =======
16
+ github.com/elastic/elastic-agent-client/v7 v7.17.1
17
+ github.com/elastic/elastic-agent-libs v0.18.6
18
+ github.com/elastic/elastic-agent-system-metrics v0.11.8
19
+ >>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436))
14
20
github.com/elastic/go-elasticsearch/v8 v8.17.0
15
21
github.com/elastic/go-ucfg v0.8.8
16
22
github.com/fxamacker/cbor/v2 v2.6.0
Original file line number Diff line number Diff line change @@ -31,12 +31,21 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
31
31
github.com/docker/go-units v0.5.0 /go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk =
32
32
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY =
33
33
github.com/dustin/go-humanize v1.0.1 /go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto =
34
+ <<<<<<< HEAD
34
35
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo =
35
36
github.com/elastic/elastic-agent-client/v7 v7.17.0 /go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI =
36
37
github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c =
37
38
github.com/elastic/elastic-agent-libs v0.18.1 /go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U =
38
39
github.com/elastic/elastic-agent-system-metrics v0.11.7 h1:1xm2okCM0eQZ4jivZgUFSlt6HAn/nPgKB/Fj8eLG6mY =
39
40
github.com/elastic/elastic-agent-system-metrics v0.11.7 /go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI =
41
+ =======
42
+ github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0 =
43
+ github.com/elastic/elastic-agent-client/v7 v7.17.1 /go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM =
44
+ github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw =
45
+ github.com/elastic/elastic-agent-libs v0.18.6 /go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno =
46
+ github.com/elastic/elastic-agent-system-metrics v0.11.8 h1:O12rj3Gojqa9UX8gA6Dj1XDIGeZXgXOAvxQbvC+XLbA =
47
+ github.com/elastic/elastic-agent-system-metrics v0.11.8 /go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag =
48
+ >>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436))
40
49
github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA =
41
50
github.com/elastic/elastic-transport-go/v8 v8.6.0 /go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk =
42
51
github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0 =
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.1 // indirect
38
+ =======
39
+ github.com/elastic/elastic-agent-libs v0.18.6 // indirect
40
+ >>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436))
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 @@ -37,10 +37,17 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj
37
37
github.com/docker/go-connections v0.5.0 /go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc =
38
38
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
+ <<<<<<< HEAD
40
41
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo =
41
42
github.com/elastic/elastic-agent-client/v7 v7.17.0 /go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI =
42
43
github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c =
43
44
github.com/elastic/elastic-agent-libs v0.18.1 /go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U =
45
+ =======
46
+ github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0 =
47
+ github.com/elastic/elastic-agent-client/v7 v7.17.1 /go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM =
48
+ github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw =
49
+ github.com/elastic/elastic-agent-libs v0.18.6 /go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno =
50
+ >>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436))
44
51
github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw =
45
52
github.com/elastic/go-sysinfo v1.15.0 /go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk =
46
53
github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk =
You can’t perform that action at this time.
0 commit comments