Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2025

Bumps github.com/cockroachdb/pebble/v2 from 2.1.1 to 2.1.2.

Release notes

Sourced from github.com/cockroachdb/pebble/v2's releases.

v2.1.2

Pebble release used in production by CockroachDB 25.3.0, with v2 path.

Caution! v2.x no longer supports the oldest on-disk formats; see README.

What's Changed

Full Changelog: cockroachdb/pebble@v2.1.1...v2.1.2

Commits
  • 525a66e feat: add pebblegozstd build tag to allow to configure zstd lib
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #19663 done by [Mergify](https://mergify.com).

#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
@mergify mergify bot requested a review from a team as a code owner November 25, 2025 08:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Cherry-pick of aaa59d4 has failed:

On branch mergify/bp/9.1/pr-19663
Your branch is up to date with 'origin/9.1'.

You are currently cherry-picking commit aaa59d4f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 25, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Contributor

elasticmachine commented Nov 25, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants