Skip to content

Commit 1ae6842

Browse files
committed
additional conflicts to fix
1 parent c57efed commit 1ae6842

File tree

4 files changed

+48
-73
lines changed

4 files changed

+48
-73
lines changed

NOTICE-fips.txt

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Elastic Beats
22
Copyright 2014-2025 Elasticsearch BV
33

4-
This product includes software developed by The Apache Software
4+
This product includes software developed by The Apache Software
55
Foundation (http://www.apache.org/).
66

77
================================================================================
@@ -1254,19 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
<<<<<<< HEAD
1258-
Version: v0.26.1
1259-
Licence type (autodetected): Apache-2.0
1260-
--------------------------------------------------------------------------------
1261-
1262-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
1263-
=======
12641257
Version: v0.27.0
12651258
Licence type (autodetected): Apache-2.0
12661259
--------------------------------------------------------------------------------
12671260

12681261
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
1269-
>>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
12701262

12711263
Apache License
12721264
Version 2.0, January 2004
@@ -39761,7 +39753,7 @@ Licence type (autodetected): MIT
3976139753
Contents of probable licence file $GOMODCACHE/github.com/dgryski/[email protected]/LICENSE:
3976239754

3976339755
This package is a mechanical translation of the reference C++ code for
39764-
MetroHash, available at https://github.com/jandrewrogers/MetroHash
39756+
MetroHash, available at https://github.com/jandrewrogers/MetroHash
3976539757

3976639758
The MIT License (MIT)
3976739759

@@ -46324,7 +46316,7 @@ Mozilla Public License Version 2.0
4632446316
means any form of the work other than Source Code Form.
4632546317

4632646318
1.7. "Larger Work"
46327-
means a work that combines Covered Software with other material, in
46319+
means a work that combines Covered Software with other material, in
4632846320
a separate file or files, that is not Covered Software.
4632946321

4633046322
1.8. "License"
@@ -85738,27 +85730,27 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/evanphx/json-patch.v4@v4.
8573885730
Copyright (c) 2014, Evan Phoenix
8573985731
All rights reserved.
8574085732

85741-
Redistribution and use in source and binary forms, with or without
85733+
Redistribution and use in source and binary forms, with or without
8574285734
modification, are permitted provided that the following conditions are met:
8574385735

8574485736
* Redistributions of source code must retain the above copyright notice, this
8574585737
list of conditions and the following disclaimer.
8574685738
* Redistributions in binary form must reproduce the above copyright notice,
8574785739
this list of conditions and the following disclaimer in the documentation
8574885740
and/or other materials provided with the distribution.
85749-
* Neither the name of the Evan Phoenix nor the names of its contributors
85750-
may be used to endorse or promote products derived from this software
85741+
* Neither the name of the Evan Phoenix nor the names of its contributors
85742+
may be used to endorse or promote products derived from this software
8575185743
without specific prior written permission.
8575285744

85753-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
85754-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
85755-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
85756-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
85757-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
85758-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
85759-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
85760-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
85761-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
85745+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
85746+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
85747+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
85748+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
85749+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
85750+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
85751+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
85752+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
85753+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
8576285754
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8576385755

8576485756

@@ -85810,7 +85802,7 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/natefinch/lumberjack.v2@v
8581085802

8581185803
The MIT License (MIT)
8581285804

85813-
Copyright (c) 2014 Nate Finch
85805+
Copyright (c) 2014 Nate Finch
8581485806

8581585807
Permission is hereby granted, free of charge, to any person obtaining a copy
8581685808
of this software and associated documentation files (the "Software"), to deal
@@ -85841,13 +85833,13 @@ Contents of probable licence file $GOMODCACHE/howett.net/[email protected]/LICENSE:
8584185833
Copyright (c) 2013, Dustin L. Howett. All rights reserved.
8584285834

8584385835
Redistribution and use in source and binary forms, with or without
85844-
modification, are permitted provided that the following conditions are met:
85836+
modification, are permitted provided that the following conditions are met:
8584585837

8584685838
1. Redistributions of source code must retain the above copyright notice, this
85847-
list of conditions and the following disclaimer.
85839+
list of conditions and the following disclaimer.
8584885840
2. Redistributions in binary form must reproduce the above copyright notice,
8584985841
this list of conditions and the following disclaimer in the documentation
85850-
and/or other materials provided with the distribution.
85842+
and/or other materials provided with the distribution.
8585185843

8585285844
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
8585385845
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -85861,7 +85853,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
8586185853
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8586285854

8586385855
The views and conclusions contained in the software and documentation are those
85864-
of the authors and should not be interpreted as representing official policies,
85856+
of the authors and should not be interpreted as representing official policies,
8586585857
either expressed or implied, of the FreeBSD Project.
8586685858

8586785859
--------------------------------------------------------------------------------
@@ -88343,4 +88335,4 @@ Contents of the file that refers to the licence https://opensource.apple.com/sou
8834388335
distributed under the License is distributed on an "AS IS" BASIS,
8834488336
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
8834588337
See the License for the specific language governing permissions and
88346-
limitations under the License.
88338+
limitations under the License.

NOTICE.txt

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Elastic Beats
22
Copyright 2014-2025 Elasticsearch BV
33

4-
This product includes software developed by The Apache Software
4+
This product includes software developed by The Apache Software
55
Foundation (http://www.apache.org/).
66

77
================================================================================
@@ -1254,19 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
<<<<<<< HEAD
1258-
Version: v0.26.1
1259-
Licence type (autodetected): Apache-2.0
1260-
--------------------------------------------------------------------------------
1261-
1262-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
1263-
=======
12641257
Version: v0.27.0
12651258
Licence type (autodetected): Apache-2.0
12661259
--------------------------------------------------------------------------------
12671260

12681261
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
1269-
>>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
12701262

12711263
Apache License
12721264
Version 2.0, January 2004
@@ -41609,7 +41601,7 @@ Licence type (autodetected): MIT
4160941601
Contents of probable licence file $GOMODCACHE/github.com/dgryski/[email protected]/LICENSE:
4161041602

4161141603
This package is a mechanical translation of the reference C++ code for
41612-
MetroHash, available at https://github.com/jandrewrogers/MetroHash
41604+
MetroHash, available at https://github.com/jandrewrogers/MetroHash
4161341605

4161441606
The MIT License (MIT)
4161541607

@@ -41676,7 +41668,7 @@ Contents of probable licence file $GOMODCACHE/github.com/digitalocean/go-libvirt
4167641668
Apache License
4167741669
==============
4167841670

41679-
_Version 2.0, January 2004_
41671+
_Version 2.0, January 2004_
4168041672
_&lt;<http://www.apache.org/licenses/>&gt;_
4168141673

4168241674
### Terms and Conditions for use, reproduction, and distribution
@@ -41855,13 +41847,13 @@ the same “printed page” as the copyright notice for easier identification wi
4185541847
third-party archives.
4185641848

4185741849
Copyright [yyyy] [name of copyright owner]
41858-
41850+
4185941851
Licensed under the Apache License, Version 2.0 (the "License");
4186041852
you may not use this file except in compliance with the License.
4186141853
You may obtain a copy of the License at
41862-
41854+
4186341855
http://www.apache.org/licenses/LICENSE-2.0
41864-
41856+
4186541857
Unless required by applicable law or agreed to in writing, software
4186641858
distributed under the License is distributed on an "AS IS" BASIS,
4186741859
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50060,7 +50052,7 @@ Mozilla Public License Version 2.0
5006050052
means any form of the work other than Source Code Form.
5006150053

5006250054
1.7. "Larger Work"
50063-
means a work that combines Covered Software with other material, in
50055+
means a work that combines Covered Software with other material, in
5006450056
a separate file or files, that is not Covered Software.
5006550057

5006650058
1.8. "License"
@@ -53816,10 +53808,10 @@ License at
5381653808
Unless required by applicable law or agreed to in writing, software distributed
5381753809
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
5381853810
CONDITIONS OF ANY KIND, either express or implied. See the License for the
53819-
specific language governing permissions and limitations under the License.
53811+
specific language governing permissions and limitations under the License.
5382053812

5382153813
------
53822-
53814+
5382353815
Apache License
5382453816
Version 2.0, January 2004
5382553817
http://www.apache.org/licenses/
@@ -96443,27 +96435,27 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/evanphx/json-patch.v4@v4.
9644396435
Copyright (c) 2014, Evan Phoenix
9644496436
All rights reserved.
9644596437

96446-
Redistribution and use in source and binary forms, with or without
96438+
Redistribution and use in source and binary forms, with or without
9644796439
modification, are permitted provided that the following conditions are met:
9644896440

9644996441
* Redistributions of source code must retain the above copyright notice, this
9645096442
list of conditions and the following disclaimer.
9645196443
* Redistributions in binary form must reproduce the above copyright notice,
9645296444
this list of conditions and the following disclaimer in the documentation
9645396445
and/or other materials provided with the distribution.
96454-
* Neither the name of the Evan Phoenix nor the names of its contributors
96455-
may be used to endorse or promote products derived from this software
96446+
* Neither the name of the Evan Phoenix nor the names of its contributors
96447+
may be used to endorse or promote products derived from this software
9645696448
without specific prior written permission.
9645796449

96458-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
96459-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
96460-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
96461-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
96462-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
96463-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
96464-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
96465-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
96466-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
96450+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
96451+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
96452+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
96453+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
96454+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
96455+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
96456+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
96457+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
96458+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9646796459
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9646896460

9646996461

@@ -96515,7 +96507,7 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/natefinch/lumberjack.v2@v
9651596507

9651696508
The MIT License (MIT)
9651796509

96518-
Copyright (c) 2014 Nate Finch
96510+
Copyright (c) 2014 Nate Finch
9651996511

9652096512
Permission is hereby granted, free of charge, to any person obtaining a copy
9652196513
of this software and associated documentation files (the "Software"), to deal
@@ -96546,13 +96538,13 @@ Contents of probable licence file $GOMODCACHE/howett.net/[email protected]/LICENSE:
9654696538
Copyright (c) 2013, Dustin L. Howett. All rights reserved.
9654796539

9654896540
Redistribution and use in source and binary forms, with or without
96549-
modification, are permitted provided that the following conditions are met:
96541+
modification, are permitted provided that the following conditions are met:
9655096542

9655196543
1. Redistributions of source code must retain the above copyright notice, this
96552-
list of conditions and the following disclaimer.
96544+
list of conditions and the following disclaimer.
9655396545
2. Redistributions in binary form must reproduce the above copyright notice,
9655496546
this list of conditions and the following disclaimer in the documentation
96555-
and/or other materials provided with the distribution.
96547+
and/or other materials provided with the distribution.
9655696548

9655796549
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
9655896550
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -96566,7 +96558,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9656696558
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9656796559

9656896560
The views and conclusions contained in the software and documentation are those
96569-
of the authors and should not be interpreted as representing official policies,
96561+
of the authors and should not be interpreted as representing official policies,
9657096562
either expressed or implied, of the FreeBSD Project.
9657196563

9657296564
--------------------------------------------------------------------------------
@@ -99048,4 +99040,4 @@ Contents of the file that refers to the licence https://opensource.apple.com/sou
9904899040
distributed under the License is distributed on an "AS IS" BASIS,
9904999041
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9905099042
See the License for the specific language governing permissions and
99051-
limitations under the License.
99043+
limitations under the License.

go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ require (
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.10.0
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2
21-
<<<<<<< HEAD
22-
github.com/elastic/elastic-agent-libs v0.26.1
23-
=======
2421
github.com/elastic/elastic-agent-libs v0.27.0
25-
>>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
2622
github.com/elastic/elastic-agent-system-metrics v0.13.4
2723
github.com/elastic/elastic-transport-go/v8 v8.8.0
2824
github.com/elastic/go-elasticsearch/v8 v8.19.0

go.sum

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,13 +495,8 @@ github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQB
495495
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
496496
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
497497
github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk=
498-
<<<<<<< HEAD
499-
github.com/elastic/elastic-agent-libs v0.26.1 h1:ywjSQajyjiv7zQTsyZjghIVb7PpPCrXZRUOhbV3KdFM=
500-
github.com/elastic/elastic-agent-libs v0.26.1/go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A=
501-
=======
502498
github.com/elastic/elastic-agent-libs v0.27.0 h1:PV6Hsrj4ZIasSpTWdy7rkQGp1ypNnsRGSqIXVVNnvVY=
503499
github.com/elastic/elastic-agent-libs v0.27.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ=
504-
>>>>>>> 9b97e719c (Update elastic-agent-libs to v0.27.0 (#11635))
505500
github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c=
506501
github.com/elastic/elastic-agent-system-metrics v0.13.4/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U=
507502
github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=

0 commit comments

Comments
 (0)