summaryrefslogtreecommitdiff
path: root/without-test-modules
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-03-27 11:13:30 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-03-27 11:13:30 (GMT)
commitf56259c2ce62c301f0e0f9dd7c85001b45fc8f5c (patch)
treebdf2e7ad0985212e306d5b970c0999087b81f91b /without-test-modules
parent170d81eba0568856401f57ce655ad9881b802d21 (diff)
parent9cbf777d614b8f240ccaa0203e7e3ba40b487f11 (diff)
downloadmorph-f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c.tar.gz
Merge branch 'baserock/richardipsum/merge_distbuild'
Conflicts: morphlib/plugins/deploy_plugin.py without-test-modules Reviewed by: Richard Maw Lars Wirzenius
Diffstat (limited to 'without-test-modules')
-rw-r--r--without-test-modules1
1 files changed, 1 insertions, 0 deletions
diff --git a/without-test-modules b/without-test-modules
index 29f88f1..9b89330 100644
--- a/without-test-modules
+++ b/without-test-modules
@@ -31,5 +31,6 @@ morphlib/plugins/branch_and_merge_new_plugin.py
morphlib/plugins/print_architecture_plugin.py
morphlib/plugins/add_binary_plugin.py
morphlib/plugins/push_pull_plugin.py
+morphlib/plugins/distbuild_plugin.py
# Not unit tested, since it needs a full system branch
morphlib/buildbranch.py