Merge ~adam-collard/maas:md2-fix-since into maas:2.9

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 69f6939b3828659f0300a98bb9b410dd805a54e3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:md2-fix-since
Merge into: maas:2.9
Diff against target: 26 lines (+2/-2)
2 files modified
src/maasserver/deprecations.py (+1/-1)
src/maasserver/tests/test_deprecations.py (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander unittests Pending
Review via email: mp+399925@code.launchpad.net

Commit message

MD2 is active since 2.9.3.

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/deprecations.py b/src/maasserver/deprecations.py
2index 9538c43..e7ee5d7 100644
3--- a/src/maasserver/deprecations.py
4+++ b/src/maasserver/deprecations.py
5@@ -31,7 +31,7 @@ class Deprecation:
6 DEPRECATIONS = {
7 "RSD_REMOVAL": Deprecation(
8 id="MD2",
9- since="2.9.4",
10+ since="2.9.3",
11 description=(
12 "Support for RSD pods will be dropped in the next major release."
13 ),
14diff --git a/src/maasserver/tests/test_deprecations.py b/src/maasserver/tests/test_deprecations.py
15index 11e5e51..226859f 100644
16--- a/src/maasserver/tests/test_deprecations.py
17+++ b/src/maasserver/tests/test_deprecations.py
18@@ -19,7 +19,7 @@ class TestGetDeprecations(MAASServerTestCase):
19 factory.make_Pod(pod_type="rsd")
20 [md2] = get_deprecations()
21 self.assertEqual(md2.id, "MD2")
22- self.assertEqual(md2.since, "2.9.4")
23+ self.assertEqual(md2.since, "2.9.3")
24
25
26 class TestLogDeprecations(MAASServerTestCase):

Subscribers

People subscribed via source and target branches