Merge ~adam-collard/maas:sampledata-dep-machine-resources into maas:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 872b8514253d95bd3392cd385720542092bb1886
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:sampledata-dep-machine-resources
Merge into: maas:master
Diff against target: 12 lines (+1/-1)
1 file modified
Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato Approve
MAAS Lander unittests Pending
Review via email:

Commit message

LP: #1915359 - Add machine-resources as a dependency of sampledata

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


review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 42cc456..a63146b 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -269,7 +269,7 @@ check: clean test
6 api-docs.rst: bin/maas-region src/maasserver/api/ syncdb
7 bin/maas-region generate_api_doc > $@
9-sampledata: bin/maas-region bin/database syncdb
10+sampledata: bin/maas-region bin/database syncdb machine-resources
11 $(dbrun) bin/maas-region generate_sample_data
12 .PHONY: sampledata


People subscribed via source and target branches