Merge lp:~allenap/maas/remove-maas into lp:~maas-committers/maas/trunk
Proposed by
Gavin Panella
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Gavin Panella | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5587 | ||||
Proposed branch: | lp:~allenap/maas/remove-maas | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
397 lines (+81/-61) 17 files modified
HACKING.txt (+9/-5) Makefile (+2/-1) buildout.cfg (+2/-3) docs/conf.py (+2/-1) docs/troubleshooting.rst (+1/-1) media/README (+4/-4) services/reloader/run (+1/-1) src/maascli/cli.py (+2/-2) src/maasserver/__init__.py (+1/-1) src/maasserver/djangosettings/demo.py (+1/-1) src/maasserver/djangosettings/development.py (+1/-1) src/maasserver/djangosettings/settings.py (+3/-3) src/maasserver/djangosettings/tests/test_settings.py (+2/-2) src/maasserver/management/commands/dbupgrade.py (+46/-3) src/maasserver/management/commands/tests/test_dbupgrade.py (+4/-1) utilities/check-imports (+0/-27) utilities/remote-reinstall (+0/-4) |
||||
To merge this branch: | bzr merge lp:~allenap/maas/remove-maas | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Andres Rodriguez (community) | Needs Information | ||
Review via email: mp+310634@code.launchpad.net |
Commit message
Remove src/maas.
Description of the change
This fails in one test: http://
I haven't been able to figure it out yet, but I wanted to put this up in case someone else <cough>Blake<cough> would have an idea.
To post a comment you must log in.
I will have to dig into this to see why its failing. It has to be something in the tarball that is used for upgrading pre 2.0.