Skip to content

Commit 17b48fe

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
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](cockroachdb/pebble@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] <[email protected]> * Update NOTICE.txt * Update NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> (cherry picked from commit aaa59d4) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum
1 parent c09d04d commit 17b48fe

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

NOTICE-fips.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7474

7575
--------------------------------------------------------------------------------
7676
Dependency : github.com/cockroachdb/pebble/v2
77+
<<<<<<< HEAD
7778
Version: v2.0.7
7879
Licence type (autodetected): BSD-3-Clause
7980
--------------------------------------------------------------------------------
8081

8182
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/[email protected]/LICENSE:
83+
=======
84+
Version: v2.1.2
85+
Licence type (autodetected): BSD-3-Clause
86+
--------------------------------------------------------------------------------
87+
88+
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/[email protected]/LICENSE:
89+
>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
8290

8391
Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
8492

NOTICE.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7474

7575
--------------------------------------------------------------------------------
7676
Dependency : github.com/cockroachdb/pebble/v2
77+
<<<<<<< HEAD
7778
Version: v2.0.7
7879
Licence type (autodetected): BSD-3-Clause
7980
--------------------------------------------------------------------------------
8081

8182
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/[email protected]/LICENSE:
83+
=======
84+
Version: v2.1.2
85+
Licence type (autodetected): BSD-3-Clause
86+
--------------------------------------------------------------------------------
87+
88+
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble/[email protected]/LICENSE:
89+
>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
8290

8391
Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
8492

go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ go 1.25.4
55
require (
66
github.com/KimMachineGun/automemlimit v0.7.5
77
github.com/cespare/xxhash/v2 v2.3.0
8+
<<<<<<< HEAD
89
github.com/cockroachdb/pebble/v2 v2.0.7
10+
=======
11+
github.com/cockroachdb/pebble/v2 v2.1.2
12+
>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
913
github.com/dustin/go-humanize v1.0.1
1014
github.com/elastic/apm-aggregation v1.4.0
1115
github.com/elastic/apm-data v1.19.5

go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,13 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
122122
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
123123
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
124124
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
125+
<<<<<<< HEAD
125126
github.com/cockroachdb/pebble/v2 v2.0.7 h1:9TkE155mj6KPO14+06z8Jytbm7JVs0Einn+pKWNyPWQ=
126127
github.com/cockroachdb/pebble/v2 v2.0.7/go.mod h1:un1DXG73PKw3F7Ndd30YactyvsFviI9Fuhe0tENdnyA=
128+
=======
129+
github.com/cockroachdb/pebble/v2 v2.1.2 h1:IwYt+Y2Cdw6egblwk1kWzdmJvD2680t5VK/3i0BJ6IA=
130+
github.com/cockroachdb/pebble/v2 v2.1.2/go.mod h1:Aza05DCCc05ghIJZkB4Q/axv/JK9wx5cFwWcnhG0eGw=
131+
>>>>>>> aaa59d4f (build(deps): bump github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2 (#19663))
127132
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
128133
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
129134
github.com/cockroachdb/swiss v0.0.0-20250624142022-d6e517c1d961 h1:Nua446ru3juLHLZd4AwKNzClZgL1co3pUPGv3o8FlcA=

0 commit comments

Comments
 (0)