loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into loic

Browse source
This commit is contained in:
manzerbredes 2016-02-28 20:45:35 +01:00
commit c35c880662
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/core/Compute.php
View file

@ -84,7 +84,7 @@ class compute
* Get image details. * Get image details.
* @return array * @return array
*/ */
public function getImage(array $options = []) public function getImage()
{ {
$imageId = $this->app->getPostParam("imageId"); $imageId = $this->app->getPostParam("imageId");
$opt = array('id' => $imageId); $opt = array('id' => $imageId);

8
server/core/LibOverride/genTokenOptions.php
View file

@ -263,10 +263,10 @@ class genTokenOptions
$this->backup["roles"] = $backup["roles"]; $this->backup["roles"] = $backup["roles"];
$this->backup["project"] = $backup["project"]; $this->backup["project"] = $backup["project"];
$this->backup["user"] = $backup["user"]; $this->backup["user"] = $backup["user"];
loadComputeBackup($backup["Compute"]); $this->loadComputeBackup($backup["Compute"]);
loadIdentityBackup($backup["Identity"]); $this->loadIdentityBackup($backup["Identity"]);
loadImageBackup($backup["Image"]); $this->loadImageBackup($backup["Image"]);
loadNetworkBackup($backup["Network"]); $this->loadNetworkBackup($backup["Network"]);
} }