Created by Diogo Matsubara on 2012-09-24 and last modified on 2012-09-25
Get this branch:
bzr branch lp:~maas-maintainers/maas/auto-merge-test
Members of MAAS Maintainers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

MAAS Maintainers

Recent revisions

1000. By Diogo Matsubara on 2012-09-25

[r=matsubara][bug=][author=matsubara] foo bar precise

999. By Diogo Matsubara on 2012-09-25

[r=matsubara][bug=][author=matsubara] test test

998. By Diogo Matsubara on 2012-09-25

[r=matsubara][bug=][author=matsubara] test

997. By Diogo Matsubara on 2012-09-25

[r=matsubara][bug=][author=matsubara] another change

996. By MAAS Lander on 2012-09-25

empty checkin

995. By Diogo Matsubara on 2012-09-24

[r=matsubara][bug=][author=matsubara] just a test change

994. By Gavin Panella on 2012-09-24

make offline=true <target> now keeps buildout and virtualenv off the network for all targets.

Previously there was a build-offline target that permitted an offline build only. This is a more general solution.

This is a backport of the changes in lp:~allenap/maas/offline-more.

993. By Gavin Panella on 2012-09-24

Removes the management of production dependencies from the purview of buildout.

Dependencies that form the final product will no longer be version controlled by buildout. They are assumed to be available on the system already. This is taken care of by `make install-dependencies`. The only dependencies managed by buildout are for testing and development.

This is a backport of lp:~allenap/maas/prod-deps-not-in-buildout and lp:~allenap/maas/lxml-not-a-test-dep from trunk.

992. By Jeroen T. Vermeulen on 2012-09-17

Backport of trunk r1003: Fix incorrect module path on report_boot_images task in beat schedule.

991. By Jeroen T. Vermeulen on 2012-09-14

Backport trunk r1001. Show persistent error message about missing boot images.

As per pre-imp with Julian: rather than validate boot requests against available images (for specific architectures, releases etc.) this simpler solution merely checks whether any boot images have been reported at all. The bug this addresses is really just about warning when the import script has not run at all.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.