Merge lp:~leftyfb/maas/1523674 into lp:~maas-committers/maas/trunk
- 1523674
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Mike Pontillo | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4554 | ||||
Proposed branch: | lp:~leftyfb/maas/1523674 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
10 lines (+1/-0) 1 file modified
src/provisioningserver/drivers/hardware/virsh.py (+1/-0) |
||||
To merge this branch: | bzr merge lp:~leftyfb/maas/1523674 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+280077@code.launchpad.net |
Commit message
Fix for bug 1523674, virsh is reporting ppc64le, not ppc64el.
Description of the change
Fix for bug 1523674, virsh is reporting ppc64le, not ppc64el.
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~leftyfb/maas/1523674 into lp:maas failed. Below is the output from the failed tests.
Hit http://
Get:1 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Get:6 http://
Get:7 http://
Get:8 http://
Get:9 http://
Get:10 http://
Get:11 http://
Get:12 http://
Get:13 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~leftyfb/maas/1523674 into lp:maas failed. Below is the output from the failed tests.
Get:1 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:2 http://
Get:3 http://
Get:4 http://
Get:5 http://
Get:6 http://
Get:7 http://
Get:8 http://
Get:9 http://
Get:10 http://
Get:11 http://
Get:12 http://
Get:13 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Mike Pontillo (mpontillo) wrote : | # |
This looks like a "random" failure:
django.
I'll resubmit.
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~leftyfb/maas/1523674 into lp:maas failed. Below is the output from the failed tests.
Hit:1 http://
Get:2 http://
Hit:3 http://
Hit:4 http://
Hit:5 http://
Get:6 http://
Get:7 http://
Get:8 http://
Get:9 http://
Get:10 http://
Get:11 http://
Fetched 23.0 MB in 9s (2,480 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
The following packages were automatically installed and are no longer required:
libc-ares-dev libc-ares2 libisl13 libv8-3.14-dev libv8-3.14.5
linux-
linux-
linux-
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
sudo DEBIAN_
--no-
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.17-3ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12).
bind9utils is al...
Mike Pontillo (mpontillo) wrote : | # |
Arg. We really need to fix that.
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~leftyfb/maas/1523674 into lp:maas failed. Below is the output from the failed tests.
Hit:1 http://
Hit:2 http://
Hit:3 http://
Hit:4 http://
Hit:5 http://
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
The following packages were automatically installed and are no longer required:
libc-ares-dev libc-ares2 libisl13 libv8-3.14-dev libv8-3.14.5
linux-
linux-
linux-
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
sudo DEBIAN_
--no-
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.17-3ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12).
bind9utils is already the newest version (1:9.9.5.dfsg-12).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.45.0-1ubuntu1).
debhelper is already the newest version (9.20151126ubun
dh-apport is already the newest version (2.19.3-0ubuntu2).
dh-systemd is already the newest version (1.24ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.9.5.dfsg-12).
firefox is already the newest version (42.0+build2-
freeipmi-tools is already the newest version (1.1.5-3ubuntu7).
git is already the newest version (1:2.6.3-1).
isc-dhcp-common is already ...
Preview Diff
1 | === modified file 'src/provisioningserver/drivers/hardware/virsh.py' |
2 | --- src/provisioningserver/drivers/hardware/virsh.py 2015-12-01 18:12:59 +0000 |
3 | +++ src/provisioningserver/drivers/hardware/virsh.py 2015-12-09 21:01:55 +0000 |
4 | @@ -29,6 +29,7 @@ |
5 | ARCH_FIX = { |
6 | 'x86_64': 'amd64', |
7 | 'ppc64': 'ppc64el', |
8 | + 'ppc64le': 'ppc64el', |
9 | 'i686': 'i386', |
10 | } |
11 |
Looks good. I didn't realize there was a debate about this.
https:/ /lists. debian. org/debian- powerpc/ 2014/08/ msg00042. html
We should consider landing this for 1.9rc4 as well.