Merge lp://staging/~allenap/maas/1.3-dev-env-distribute into lp://staging/maas/1.3
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Merged at revision: | 1463 |
Proposed branch: | lp://staging/~allenap/maas/1.3-dev-env-distribute |
Merge into: | lp://staging/maas/1.3 |
Diff against target: |
41 lines (+7/-2) 3 files modified
required-packages/dev (+1/-0) src/maasserver/tests/test_views_settings.py (+5/-1) versions.cfg (+1/-1) |
To merge this branch: | bzr merge lp://staging/~allenap/maas/1.3-dev-env-distribute |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+163364@code.staging.launchpad.net |
Commit message
Get the development environment working in Raring Ringtail.
Browser tests (using Firefox) do not currently pass.
Backport of r1462 from lp:maas.
To post a comment you must log in.
The Jenkins job https:/ /jenkins. qa.ubuntu. com/job/ maas-merger- 1.3/3/console reported an error when processing this lp:~allenap/maas/1.3-dev-env-distribute branch.
Not merging it.