Skip to content

Fix local patch which can't auto apply to master #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yaguang Tang (yaguangtang) wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix local patch which can't auto apply to master #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557203e
chore: fix the local patch which can't auto apply to master
yaguangtang Jun 25, 2026
c672c7c
Merge branch 'main' into fix-local-patch
yaguangtang Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: vexxhost/docker-atmosphere/.github/actions/checkout@70f8dfc6d54fdcfc58940cd93cecced306374ed7 # main
with:
repository: openstack/cinder
ref: a0fa5b2fe3179e8374c41000fdd354078ba49cc6 # master
ref: a8b60a32cc0aca249a6e4cd74c2fd89ec8a4996c # master

- uses: vexxhost/docker-atmosphere/.github/actions/build-image@70f8dfc6d54fdcfc58940cd93cecced306374ed7 # main
with:
Expand Down
2 changes: 1 addition & 1 deletion patches/openstack/cinder/0001-Create-encrypted-volumes-directly-to-RBD.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ index f1ffeb89e..cf768df06 100644
+ '12288M')

@mock.patch('cinder.objects.Volume.get_by_id')
@mock.patch('cinder.db.volume_glance_metadata_get', return_value={})
@mock.patch('cinder.db.api.volume_glance_metadata_get', return_value={})
diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 1f4dac8d9..aace801f3 100644
--- a/cinder/volume/drivers/rbd.py
Expand Down
Loading