launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #14363
[Merge] lp:~rvb/maas/fixture-error-1.2 into lp:maas/1.2
Raphaël Badin has proposed merging lp:~rvb/maas/fixture-error-1.2 into lp:maas/1.2.
Commit message:
Backport of revision 1282.
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~rvb/maas/fixture-error-1.2/+merge/134923
Backport of revision 1282.
Original MP: https://code.launchpad.net/~rvb/maas/fixture-error/+merge/130120
--
https://code.launchpad.net/~rvb/maas/fixture-error-1.2/+merge/134923
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/maas/fixture-error-1.2 into lp:maas/1.2.
=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml 2012-10-08 10:40:20 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml 2012-11-19 14:14:19 +0000
@@ -1,6 +1,6 @@
- fields: {
created: 2012-01-24, hostname: sun, architecture: 'i386/generic',
- owner: null, status: 0, nodegroup: 1, tags: [30],
+ owner: null, status: 0, nodegroup: null, tags: [30],
cpu_count: 16, memory: 16384,
system_id: node-2666dd64-4671-11e1-93b8-00225f89f211,
updated: !!timestamp '2012-01-24 10:52:38.735954'}
@@ -8,7 +8,7 @@
pk: 15
- fields: {
created: 2012-01-24, hostname: moon, architecture: 'i386/generic',
- owner: null, status: 2, nodegroup: 1, tags: [],
+ owner: null, status: 2, nodegroup: null, tags: [],
cpu_count: 1, memory: 512,
system_id: node-29d7ad70-4671-11e1-93b8-00225f89f211,
updated: !!timestamp '2012-01-24 10:52:44.507777'}
@@ -16,7 +16,7 @@
pk: 16
- fields: {
created: 2012-01-24, hostname: mars, architecture: 'i386/generic',
- owner: 106, status: 3, nodegroup: 1, tags: [31],
+ owner: 106, status: 3, nodegroup: null, tags: [31],
cpu_count: 2, memory: 2096,
system_id: node-2d424b28-4671-11e1-93b8-00225f89f211,
updated: !!timestamp '2012-01-24 10:52:50.239704'}
@@ -24,7 +24,7 @@
pk: 17
- fields: {
created: 2012-01-24, hostname: jupiter, architecture: 'i386/generic',
- owner: null, status: 0, nodegroup: 1, tags: [30, 31],
+ owner: null, status: 0, nodegroup: null, tags: [30, 31],
cpu_count: 4, memory: 8192,
system_id: node-2fb4fec8-4671-11e1-93b8-00225f89f211,
updated: !!timestamp '2012-01-24 10:52:54.346832'}
@@ -32,7 +32,7 @@
pk: 18
- fields: {
created: 2012-01-24, hostname: saturn, architecture: 'i386/generic',
- owner: 101, status: 3, nodegroup: 1, tags: [30, 31, 32],
+ owner: 101, status: 3, nodegroup: null, tags: [30, 31, 32],
cpu_count: 4, memory: 4096,
system_id: node-33b55e28-4671-11e1-93b8-00225f89f211,
updated: !!timestamp '2012-01-24 10:53:01.060176'}