File tree 3 files changed +20
-0
lines changed
3 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -1083,11 +1083,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s
1083
1083
1084
1084
--------------------------------------------------------------------------------
1085
1085
Dependency : github.com/elastic/go-elasticsearch/v8
1086
+ <<<<<<< HEAD
1086
1087
Version: v8.16.0
1087
1088
Licence type (autodetected): Apache-2.0
1088
1089
--------------------------------------------------------------------------------
1089
1090
1090
1091
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.16.0/LICENSE:
1092
+ =======
1093
+ Version: v8.17.1
1094
+ Licence type (autodetected): Apache-2.0
1095
+ --------------------------------------------------------------------------------
1096
+
1097
+ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.17.1/LICENSE:
1098
+ >>>>>>> 8aa73ff (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.17.0 to 8.17.1 (#4468))
1091
1099
1092
1100
Apache License
1093
1101
Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -6,10 +6,17 @@ require (
6
6
github.com/Pallinder/go-randomdata v1.2.0
7
7
github.com/dgraph-io/ristretto v0.2.0
8
8
github.com/docker/go-units v0.5.0
9
+ <<<<<<< HEAD
9
10
github.com/elastic/elastic-agent-client/v7 v7.16.0
10
11
github.com/elastic/elastic-agent-libs v0.17.3
11
12
github.com/elastic/elastic-agent-system-metrics v0.11.4
12
13
github.com/elastic/go-elasticsearch/v8 v8.16.0
14
+ =======
15
+ github.com/elastic/elastic-agent-client/v7 v7.17.1
16
+ github.com/elastic/elastic-agent-libs v0.18.6
17
+ github.com/elastic/elastic-agent-system-metrics v0.11.8
18
+ github.com/elastic/go-elasticsearch/v8 v8.17.1
19
+ >>>>>>> 8aa73ff (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.17.0 to 8.17.1 (#4468))
13
20
github.com/elastic/go-ucfg v0.8.8
14
21
github.com/fxamacker/cbor/v2 v2.6.0
15
22
github.com/go-chi/chi/v5 v5.0.12
Original file line number Diff line number Diff line change @@ -39,8 +39,13 @@ github.com/elastic/elastic-agent-system-metrics v0.11.4 h1:Z/8CML5RKvGpi6/QUFok1
39
39
github.com/elastic/elastic-agent-system-metrics v0.11.4 /go.mod h1:TTW2ysv78uHBQ68hG8TXiaX1m6f29ZHgGWb8XONYsU8 =
40
40
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4 =
41
41
github.com/elastic/elastic-transport-go/v8 v8.6.1 /go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk =
42
+ <<<<<<< HEAD
42
43
github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE =
43
44
github.com/elastic/go-elasticsearch/v8 v8.16.0 /go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64 =
45
+ =======
46
+ github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q =
47
+ github.com/elastic/go-elasticsearch/v8 v8.17.1 /go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4 =
48
+ >>>>>>> 8aa73ff (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.17.0 to 8.17.1 (#4468))
44
49
github.com/elastic/go-structform v0.0.12 h1:HXpzlAKyej8T7LobqKDThUw7BMhwV6Db24VwxNtgxCs =
45
50
github.com/elastic/go-structform v0.0.12 /go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4 =
46
51
github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw =
You can’t perform that action at this time.
0 commit comments