Merge ~freyes/ubuntu/+source/magnum-ui:stable/wallaby into ~ubuntu-openstack-dev/ubuntu/+source/magnum-ui:stable/wallaby

Proposed by Felipe Reyes
Status: Needs review
Proposed branch: ~freyes/ubuntu/+source/magnum-ui:stable/wallaby
Merge into: ~ubuntu-openstack-dev/ubuntu/+source/magnum-ui:stable/wallaby
Diff against target: 114 lines (+16/-9)
8 files modified
ChangeLog (+7/-0)
PKG-INFO (+1/-1)
debian/changelog (+3/-2)
dev/null (+0/-1)
magnum_ui.egg-info/PKG-INFO (+1/-1)
magnum_ui.egg-info/SOURCES.txt (+0/-1)
magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js (+2/-1)
tox.ini (+2/-2)
Reviewer Review Type Date Requested Status
Ubuntu OpenStack uploaders Pending
Review via email: mp+439479@code.launchpad.net

Commit message

New stable point release for OpenStack Wallaby (LP: #2009966).

To post a comment you must log in.

Unmerged commits

bc24eb4... by Felipe Reyes

New stable point release for OpenStack Wallaby (LP: #2009966).

f7587b6... by Felipe Reyes

Update upstream source from tag '8.0.1'

Update to upstream version '8.0.1'
with Debian dir 4fb996cab683f27ed413de67de5226813b9998c1

2376fcc... by Felipe Reyes

New upstream version 8.0.1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ChangeLog b/ChangeLog
2index 3421e42..58edbe2 100644
3--- a/ChangeLog
4+++ b/ChangeLog
5@@ -1,6 +1,13 @@
6 CHANGES
7 =======
8
9+8.0.1
10+-----
11+
12+* Add overlay2 to Docker storage driver dropdown
13+* Update TOX\_CONSTRAINTS\_FILE for stable/wallaby
14+* Update .gitreview for stable/wallaby
15+
16 8.0.0
17 -----
18
19diff --git a/PKG-INFO b/PKG-INFO
20index 048c720..cfdb6f3 100644
21--- a/PKG-INFO
22+++ b/PKG-INFO
23@@ -1,6 +1,6 @@
24 Metadata-Version: 1.1
25 Name: magnum-ui
26-Version: 8.0.0
27+Version: 8.0.1
28 Summary: Magnum User Interface
29 Home-page: https://docs.openstack.org/developer/magnum-ui/
30 Author: OpenStack
31diff --git a/debian/changelog b/debian/changelog
32index 2dd7cb9..3f08b97 100644
33--- a/debian/changelog
34+++ b/debian/changelog
35@@ -1,8 +1,9 @@
36-magnum-ui (8.0.0-0ubuntu2) UNRELEASED; urgency=medium
37+magnum-ui (8.0.1-0ubuntu1) UNRELEASED; urgency=medium
38
39 * d/gbp.conf: Create stable/wallaby branch.
40+ * New stable point release for OpenStack Wallaby (LP: #2009966).
41
42- -- Felipe Reyes <felipe.reyes@canonical.com> Mon, 20 Mar 2023 11:03:41 -0300
43+ -- Felipe Reyes <felipe.reyes@canonical.com> Thu, 23 Mar 2023 09:30:47 -0300
44
45 magnum-ui (8.0.0-0ubuntu1) hirsute; urgency=medium
46
47diff --git a/magnum_ui.egg-info/PKG-INFO b/magnum_ui.egg-info/PKG-INFO
48index 048c720..cfdb6f3 100644
49--- a/magnum_ui.egg-info/PKG-INFO
50+++ b/magnum_ui.egg-info/PKG-INFO
51@@ -1,6 +1,6 @@
52 Metadata-Version: 1.1
53 Name: magnum-ui
54-Version: 8.0.0
55+Version: 8.0.1
56 Summary: Magnum User Interface
57 Home-page: https://docs.openstack.org/developer/magnum-ui/
58 Author: OpenStack
59diff --git a/magnum_ui.egg-info/SOURCES.txt b/magnum_ui.egg-info/SOURCES.txt
60index 56856a3..6a9d7ce 100644
61--- a/magnum_ui.egg-info/SOURCES.txt
62+++ b/magnum_ui.egg-info/SOURCES.txt
63@@ -34,7 +34,6 @@ magnum_ui.egg-info/PKG-INFO
64 magnum_ui.egg-info/SOURCES.txt
65 magnum_ui.egg-info/dependency_links.txt
66 magnum_ui.egg-info/not-zip-safe
67-magnum_ui.egg-info/pbr.json
68 magnum_ui.egg-info/requires.txt
69 magnum_ui.egg-info/top_level.txt
70 magnum_ui/api/__init__.py
71diff --git a/magnum_ui.egg-info/pbr.json b/magnum_ui.egg-info/pbr.json
72deleted file mode 100644
73index 6a0c5d7..0000000
74--- a/magnum_ui.egg-info/pbr.json
75+++ /dev/null
76@@ -1 +0,0 @@
77-{"git_version": "e551887", "is_release": true}
78\ No newline at end of file
79diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js
80index 2972732..e23763e 100644
81--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js
82+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js
83@@ -350,7 +350,8 @@
84 type: 'select',
85 titleMap: [
86 {value: "devicemapper", name: gettext("Device Mapper")},
87- {value: "overlay", name: gettext("Overlay")}
88+ {value: "overlay", name: gettext("Overlay")},
89+ {value: "overlay2", name: gettext("Overlay2")}
90 ]
91 }
92 ]
93diff --git a/tox.ini b/tox.ini
94index 3757ead..85a7fd6 100644
95--- a/tox.ini
96+++ b/tox.ini
97@@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
98 NOSE_OPENSTACK_YELLOW=0.025
99 NOSE_OPENSTACK_SHOW_ELAPSED=1
100 deps =
101- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
102+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
103 -r{toxinidir}/requirements.txt
104 -r{toxinidir}/test-requirements.txt
105 commands =
106@@ -79,7 +79,7 @@ commands =
107
108 [testenv:docs]
109 deps =
110- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
111+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
112 # magnum-ui doc generated the module reference,
113 # so requirements.txt should be here to apply upper-constraints.
114 -r{toxinidir}/requirements.txt

Subscribers

People subscribed via source and target branches