From 1cf773c9751d4d316eed893eaf627a386a9888a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Nov 2025 08:05:28 +0000 Subject: [PATCH] build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663) * build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 Bumps [github.com/cockroachdb/pebble/v2](https://github.com/cockroachdb/pebble) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/cockroachdb/pebble/releases) - [Commits](https://github.com/cockroachdb/pebble/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: github.com/cockroachdb/pebble/v2 dependency-version: 2.1.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> (cherry picked from commit aaa59d4fde2e2f36d97e7e230d19b89cbe38b687) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum --- NOTICE-fips.txt | 8 ++++++++ NOTICE.txt | 8 ++++++++ go.mod | 4 ++++ go.sum | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 8709ff3bf0..fb0812f05b 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/cockroachdb/pebble/v2 +<<<<<<< HEAD Version: v2.0.6 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.0.6/LICENSE: +======= +Version: v2.1.2 +Licence type (autodetected): BSD-3-Clause +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.1.2/LICENSE: +>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663)) Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved. diff --git a/NOTICE.txt b/NOTICE.txt index 5ed7edf25c..cff2f6e015 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/cockroachdb/pebble/v2 +<<<<<<< HEAD Version: v2.0.6 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.0.6/LICENSE: +======= +Version: v2.1.2 +Licence type (autodetected): BSD-3-Clause +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/v2@v2.1.2/LICENSE: +>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663)) Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index 9e6165eba5..d2b095ed21 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,11 @@ go 1.25.4 require ( github.com/KimMachineGun/automemlimit v0.7.5 github.com/cespare/xxhash/v2 v2.3.0 +<<<<<<< HEAD github.com/cockroachdb/pebble/v2 v2.0.6 +======= + github.com/cockroachdb/pebble/v2 v2.1.2 +>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663)) github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v1.3.0 github.com/elastic/apm-data v1.19.2 diff --git a/go.sum b/go.sum index 8f95a49d6b..d16a632b8b 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,13 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA= +<<<<<<< HEAD github.com/cockroachdb/pebble/v2 v2.0.6 h1:eL54kX2AKp1ePJ/8vq4IO3xIEPpvVjlSP12dlLYilyE= github.com/cockroachdb/pebble/v2 v2.0.6/go.mod h1:un1DXG73PKw3F7Ndd30YactyvsFviI9Fuhe0tENdnyA= +======= +github.com/cockroachdb/pebble/v2 v2.1.2 h1:IwYt+Y2Cdw6egblwk1kWzdmJvD2680t5VK/3i0BJ6IA= +github.com/cockroachdb/pebble/v2 v2.1.2/go.mod h1:Aza05DCCc05ghIJZkB4Q/axv/JK9wx5cFwWcnhG0eGw= +>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663)) github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/swiss v0.0.0-20250624142022-d6e517c1d961 h1:Nua446ru3juLHLZd4AwKNzClZgL1co3pUPGv3o8FlcA=