@@ -794,10 +794,17 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
794
794
github.com/dustin/go-humanize v1.0.1 /go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto =
795
795
github.com/elastic/e2e-testing v1.1.0 h1:Y+K215EWkf3ojAWmBK2JrxH/rITjkKM1zR8mnwIpvLw =
796
796
github.com/elastic/e2e-testing v1.1.0 /go.mod h1:8q2d8dmwavJXISowwaoreHFBnbR/uK4qanfRGhC/W9A =
797
+ <<<<<<< HEAD
797
798
github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g =
798
799
github.com/elastic/elastic-agent-autodiscover v0.6.7 /go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4 =
799
800
github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ =
800
801
github.com/elastic/elastic-agent-client/v7 v7.8.0 /go.mod h1:ihtjqJzYiIltlRhNruaSSc0ogxIhqPD5hOMKq16cI1s =
802
+ =======
803
+ github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8 =
804
+ github.com/elastic/elastic-agent-autodiscover v0.6.8 /go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4 =
805
+ github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM =
806
+ github.com/elastic/elastic-agent-client/v7 v7.8.1 /go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY =
807
+ >>>>>>> 5f8338be51 (Bump github.com/elastic/elastic-agent-client/v7 from 7.8.0 to 7.8.1 (#4431))
801
808
github.com/elastic/elastic-agent-libs v0.7.5 h1:4UMqB3BREvhwecYTs/L23oQp1hs/XUkcunPlmTZn5yg =
802
809
github.com/elastic/elastic-agent-libs v0.7.5 /go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU =
803
810
github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw =
@@ -2873,8 +2880,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
2873
2880
google.golang.org/protobuf v1.27.1 /go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc =
2874
2881
google.golang.org/protobuf v1.28.0 /go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I =
2875
2882
google.golang.org/protobuf v1.28.1 /go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I =
2876
- google.golang.org/protobuf v1.32 .0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I =
2877
- google.golang.org/protobuf v1.32 .0 /go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos =
2883
+ google.golang.org/protobuf v1.33 .0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI =
2884
+ google.golang.org/protobuf v1.33 .0 /go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos =
2878
2885
gopkg.in/airbrake/gobrake.v2 v2.0.9 /go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U =
2879
2886
gopkg.in/alecthomas/kingpin.v2 v2.2.6 /go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw =
2880
2887
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 /go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0 =
0 commit comments