opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
748 Commits 27 Branches 687 Tags
fbb12d12166a3ddbb28ee55af3a337d17dbbd7f7
Commit Graph
748 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
屈轩 fbb12d1216 避免未能及时释放usage quota 2018-12-06 22:30:10 +08:00
邱剑 79390632d0 Merge pull request #681 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-webconsole to release/2.1.0 
* commit 'e66be4ca423ee5504db34bf61459e9318a444fd0':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
 2018-12-05 20:38:17 +08:00
屈轩 e66be4ca42 修复: webconsole参数缺失，导致yunionapi RPC调用失败 2018-12-05 20:35:53 +08:00
邱剑 805dba87f6 Merge pull request #671 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-deploy-task-failed to release/2.1.0 
* commit '517357ec063ac2b9b35d10c4af49d8534071466b':
  补充其他任务失败后标记任务失败
  补充deploy任务失败处理
 2018-12-05 14:37:49 +08:00
邱剑 ee9c48d3ef Merge pull request #670 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-dissociate to release/2.1.0 
* commit '4a1ad108e466f94d91dbae210104d4c107ec3b5d':
  避免删除机器时，云端eip已经删除时，无限删除失败
 2018-12-05 14:37:39 +08:00
屈轩 517357ec06 补充其他任务失败后标记任务失败 2018-12-05 14:24:17 +08:00
屈轩 1c4053bb4c 补充deploy任务失败处理 2018-12-05 14:06:30 +08:00
屈轩 4a1ad108e4 避免删除机器时，云端eip已经删除时，无限删除失败 2018-12-05 13:31:16 +08:00
邱剑 4aa4f427b6 Merge pull request #628 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-op to release/2.1.0 
* commit '80478ca92c06649b3d7e697bc107f1d17f0a67de':
  避免eip关联主机或解绑失败后，不能再次操作
 2018-12-01 12:54:32 +08:00
屈轩 80478ca92c 避免eip关联主机或解绑失败后，不能再次操作 2018-12-01 11:23:43 +08:00
邱剑 2239592dcb Merge pull request #623 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-rule to release/2.1.0 
* commit '0f78dd1ffcb8c4fef3fd42324e5adf22eb8e911e':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
屈轩 0f78dd1ffc 大部分公有云不需要将安全组拆分为单个单个的规则 2018-11-30 20:40:59 +08:00
邱剑 6bb5f1de09 Merge pull request #610 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-knownhosts to release/2.1.0 
* commit '223c5aeb351c9fa9170dbf756bb2172f663aac62':
  忽略known_hosts记录
 2018-11-30 15:31:39 +08:00
屈轩 223c5aeb35 忽略known_hosts记录 2018-11-30 15:23:40 +08:00
邱剑 55f0ae9c9e Merge pull request #598 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-aliyun-create-instance-error to release/2.1.0 
* commit '171e4f2347d34ffbea11ac9f7f52ce64bd4ea967':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
屈轩 171e4f2347 避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败 2018-11-29 14:27:01 +08:00
屈轩 4f2d759fb6 修复: aliyun创建主机失败时，正确返回失败信息 2018-11-29 14:02:35 +08:00
邱剑 f8d0421f7a Merge pull request #580 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-rebuild-root-2.1.0 to release/2.1.0 
* commit '957a4c074446600dd2feb1378948ef972d7ad557':
  避免image_id未做转换后导致rebuild-root任务失败
 2018-11-27 21:06:38 +08:00
屈轩 957a4c0744 避免image_id未做转换后导致rebuild-root任务失败 2018-11-27 21:04:10 +08:00
李泽玺 42e96cee68 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3e5091bd1c53190f4eeca25f7c6cd0310a9914f2':
  fix typo
 2018-11-27 12:27:38 +08:00
李泽玺 3e5091bd1c Merge pull request #577 in YUNIONIO/onecloud from hotfix/rex-typo to release/2.0.0 
* commit '81c233b87867e1bded73ae9a1ef2847879820e8e':
  fix typo
 2018-11-27 12:27:38 +08:00
Zhang Dongliang 81c233b878 fix typo 2018-11-27 10:11:03 +08:00
邱剑 be38bf62f3 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b70be6be0f4007fea7b93b039c77d37a6e6f6208':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:07 +08:00
邱剑 b70be6be0f Merge pull request #565 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-task-error-msg to release/2.0.0 
* commit '58962cf2d2694264678c07670e275641b480bdb3':
  避免localtask failed时error一直是Task failed due to unknown remote errors
 2018-11-23 20:22:06 +08:00
屈轩 58962cf2d2 避免localtask failed时error一直是Task failed due to unknown remote errors 2018-11-23 19:07:20 +08:00
邱剑 34da543c46 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b5f4c472054d720858e12b9108455545fdae5749':
  避免没有objs时数组访问越界
 2018-11-22 22:07:30 +08:00
邱剑 b5f4c47205 Merge pull request #559 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-parallel-task to release/2.0.0 
* commit 'e4b771cb8229849161a6e8b9432235aa54aba8d8':
  避免没有objs时数组访问越界
 2018-11-22 22:07:30 +08:00
屈轩 e4b771cb82 避免没有objs时数组访问越界 2018-11-22 22:02:11 +08:00
邱剑 c169fdb8dc Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7d3b8ea610703af122b861a16bee85d9d31a5aea':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 7d3b8ea610 Merge pull request #493 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-post-update to release/2.0.0 
* commit 'ab846cfad77d8f01eab1f118dba1d1012c0ba4a1':
  添加更新操作后的操作
 2018-11-13 22:02:06 +08:00
邱剑 11d3059330 Merge pull request #490 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-short-desc to release/2.1.0 
* commit '36dda2a5b4ac268280c3e660d29666dcc6a68060':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:02 +08:00
屈轩 ab846cfad7 添加更新操作后的操作 2018-11-13 20:18:27 +08:00
邱剑 e3443851ad Merge pull request #486 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-server-ignore-stop-error to release/2.0.0 
* commit 'cda1edfc45cfaedc935be32b939928b341ecb3f3':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:27 +08:00
邱剑 62f27f05f5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e3443851adc4510e2944d3e77cb323289dcf3aa8':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:27 +08:00
Qiu Jian 36dda2a5b4 补充主机计费的shortdesc参数 2018-11-13 18:21:55 +08:00
Qiu Jian cda1edfc45 修正：删除主机时忽略停机错误 2018-11-13 16:16:20 +08:00
邱剑 c3371298f5 Merge pull request #476 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-changeconfig to release/2.1.0 
* commit '008d6f10f51fceba973bb3c56edeca757dca8436':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:38:47 +08:00
邱剑 1c9b0ce6d6 Merge pull request #475 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-host-undo-convert-fail to release/2.0.0 
* commit '00f5d3ba54c0e38f3c47e3ead9e9e3ba8d5ad341':
  修正：host undo convert失败
 2018-11-13 11:38:01 +08:00
邱剑 6cefc7dc02 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '1c9b0ce6d6ecce2f1faeb9fe643034d463761fe2':
  修正：host undo convert失败
 2018-11-13 11:38:01 +08:00
屈轩 008d6f10f5 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:26:33 +08:00
Qiu Jian 00f5d3ba54 修正：host undo convert失败 2018-11-13 00:25:26 +08:00
邱剑 737894f5cb Merge pull request #472 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-resize-validate to release/2.1.0 
* commit '593e8c9fd8162b1eb5f3c9d74748070f4b139113':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
屈轩 593e8c9fd8 根据主机状态判断磁盘是否可以resize 2018-11-12 21:28:50 +08:00
邱剑 248263c0c7 Merge pull request #469 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-baremtal-op to release/2.1.0 
* commit '4339e38e6988aac7b9265248931e30efd7023a51':
  适配裸金属服务器操作状态
 2018-11-12 20:13:32 +08:00
屈轩 4339e38e69 适配裸金属服务器操作状态 2018-11-12 20:11:59 +08:00
邱剑 6f9805834b Merge pull request #462 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-action-with-status to release/2.1.0 
* commit 'c0f806241f140338431415d1da5fb99293d1d357':
  guest适配操作状态
 2018-11-12 19:50:21 +08:00
屈轩 c0f806241f guest适配操作状态 2018-11-12 16:44:39 +08:00
李泽玺 ac6e7ad63d Merge pull request #461 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-batch-create-data to release/2.1.0 
* commit '160c48719c32a58b352f03fedf89e23ca22a8154':
  fix: region 批量创建 data 不正确
 2018-11-12 15:24:49 +08:00
Zexi Li 160c48719c fix: region 批量创建 data 不正确 2018-11-12 14:55:34 +08:00
邱剑 2e7c12ba1b Merge pull request #453 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-attach-disk to release/2.1.0 
* commit '89574e954a32a0e02e974b823440aeef4c2f3c18':
  挂载磁盘失败时自动解除与虚机的关系
 2018-11-10 14:31:11 +08:00