diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-02-28 19:03:33 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-02-28 19:03:33 +0100 |
| commit | 525b82b2e417829dac0875ecd659409864def2d2 (patch) | |
| tree | 27dd468b158a298c6afd71b34ee79ce5082bdcfd /server | |
| parent | 726562f0426d94c7822cf99d12cd35a9d913ca45 (diff) | |
| parent | ca0c2377788d65b043ea5ccc2a5d52b40726e06b (diff) | |
Merge branch 'compute' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/Test/computeTest.php | 1 | ||||
| -rw-r--r-- | server/core/Compute.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php index 3fae820..3ce1f2e 100644 --- a/server/Test/computeTest.php +++ b/server/Test/computeTest.php @@ -12,7 +12,6 @@ foreach($servers as $server){ //$opt = Array(); //$opt['name'] = "Test"; -//$serverid"id"[] = "69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"; //$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"); //$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}"; //unset($server); diff --git a/server/core/Compute.php b/server/core/Compute.php index 3df3ada..e95380e 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -47,7 +47,7 @@ class compute /** * Create server. * @return array - + */ public function createServer(array $options) { |