Merge lp:~blake-rouse/maas/fix-1484696-2 into lp:~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andres Rodriguez | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4311 | ||||
Proposed branch: | lp:~blake-rouse/maas/fix-1484696-2 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
41 lines (+19/-1) 2 files modified
src/maasserver/static/js/angular/factories/region.js (+6/-1) src/maasserver/static/js/angular/factories/tests/test_region.js (+13/-0) |
||||
To merge this branch: | bzr merge lp:~blake-rouse/maas/fix-1484696-2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Gavin Panella (community) | Approve | ||
Review via email: mp+272274@code.launchpad.net |
Commit message
Only include the ':' in _buildUrl if a port is defined.
This fixes an issue where if the ':' is included apache will not proxy the connection.
To post a comment you must log in.
lgtm!