Commit 01f19a7b authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' into feature/displays

parents 144aceb6 c897ff84
......@@ -269,7 +269,7 @@ sub _update_isos {
,xml => 'focal_fossa-amd64.xml'
,xml_volume => 'focal_fossa64-volume.xml'
,url => 'http://releases.ubuntu.com/20.04/'
,file_re => '^ubuntu-20.04.\d+-desktop-amd64.iso'
,file_re => '^ubuntu-20.04.*-desktop-amd64.iso'
,sha256_url => '$url/SHA256SUMS'
,min_disk_size => '9'
}
......@@ -4146,6 +4146,7 @@ sub _cmd_migrate($self, $request) {
}
}
$self->_remove_unnecessary_downs($domain);
$domain->migrate($node, $request);
my @remote_ip;
......
......@@ -71,8 +71,10 @@
</div>
</div>
</div>
</div> <! -- show=domain -->
</div><!-- jumbotron -->
</div> <!-- container -->
</div><!-- container -->
%= include 'bootstrap/scripts'
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment