Skip to content

Commit f721de4

Browse files
authored
Merge branch 'stackhpc/zed' into upstream/zed-2024-12-09
2 parents 8bbe205 + d02493c commit f721de4

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @stackhpc/openstack
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Tag & Release
3+
'on':
4+
push:
5+
branches:
6+
- stackhpc/zed
7+
permissions:
8+
actions: read
9+
contents: write
10+
jobs:
11+
tag-and-release:
12+
uses: stackhpc/.github/.github/workflows/tag-and-release.yml@main

.github/workflows/tox.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Tox Continuous Integration
3+
'on':
4+
pull_request:
5+
jobs:
6+
tox:
7+
uses: stackhpc/.github/.github/workflows/tox.yml@main

glance/tests/unit/v2/test_tasks_resource.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ def test_create_with_wrong_import_form(self):
415415
"non-local source of image data.")
416416
else:
417417
supported = ['http', ]
418-
msg = ("The given uri is not valid. Please specify a "
419-
"valid uri from the following list of supported uri "
418+
msg = ("The given URI is not valid. Please specify a "
419+
"valid URI from the following list of supported URI "
420420
"%(supported)s") % {'supported': supported}
421421
self.assertEqual(msg, final_task.message)
422422

0 commit comments

Comments
 (0)