opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
邱剑 8a2f0cb650 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0dcf76c852d1f1b0bfe989ba281f3968a83b20b5':
  避免未找到磁盘时未及时返回错误信息
 2019-01-05 17:38:05 +08:00
邱剑 a3af439e9e Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2e3164edecb959287f3e2ac5eb6d6beca53e5d74':
  磁盘详情显示虚机id
 2019-01-05 17:37:45 +08:00
屈轩 8f54b36d3c 冲突解决 2019-01-05 17:31:25 +08:00
Qiu Jian 6744fb8a4a server-create创建prepaid主机，增加auto_prepaid_recycle参数，创建后自动加入包年包月资源池 2019-01-05 17:28:34 +08:00
邱剑 8476610202 Merge pull request #889 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-delete-vm to release/2.4.0 
* commit '630d2518b171eab4b7432c07a9e2dfb01d4277b2':
  修复腾讯云无限删除预付费实例失败问题
 2019-01-05 17:09:57 +08:00
邱剑 41748899e1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8476610202a72fa4d06cc5a6cffe8fb10ac2cbc2':
  修复腾讯云无限删除预付费实例失败问题
 2019-01-05 17:09:57 +08:00
邱剑 4d15828bb5 Merge pull request #891 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-detail to release/2.3.0 
* commit 'e141a97b150706e21e0fd6ff6348972d719aa01e':
  磁盘详情显示虚机id
 2019-01-05 17:08:44 +08:00
Qiu Jian 051f5fcb6b minor fixes 2019-01-05 16:22:09 +08:00
屈轩 e141a97b15 磁盘详情显示虚机id 2019-01-05 15:46:23 +08:00
屈轩 ba4493ceea 避免未找到磁盘时未及时返回错误信息 2019-01-05 14:18:42 +08:00
屈轩 630d2518b1 修复腾讯云无限删除预付费实例失败问题 2019-01-05 11:31:09 +08:00
Qiu Jian aa776b308b 修正：image 
import过程为耗时操作，需要在LocalTaskRun里执行，避免占用image的操作锁
 2019-01-05 10:21:59 +08:00
Qiu Jian c477a05f39 增加：1. 
包年包月主机加入资源池后，如果auto_delete=true，则自动删除该主机 2.
包年包月资源池的宿主机支持续费操作Perform(host.id,
"renew-prepaid-recycle", {"duration": "1m"})
 2019-01-05 09:51:58 +08:00
邱剑 16a7306746 Merge pull request #885 in YUNIONIO/onecloud from ~NINGYU/onecloud:release/ningyu-node-discovery to release/2.5.0 
* commit 'fb65aa6a3c4d4494b65f69cc43634107672d9410':
  feat: 添加机器时，可以指定机器是宿主机，还是虚拟机
 2019-01-04 23:09:02 +08:00
ningyu fb65aa6a3c feat: 添加机器时，可以指定机器是宿主机，还是虚拟机 2019-01-04 21:15:10 +08:00
邱剑 e0dcb033bb Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'c09fd43c7d202f0ee2d48ef8743e6ca1708f62ec':
  add iso insert eject
 2019-01-04 20:08:01 +08:00
wanyaoqi ea54f54eb0 add iso insert eject 2019-01-04 20:04:44 +08:00
Qiu Jian e5aa26f0af 修正：1. storagecache.CacheImage接口需要指定format 2. 
PerformAction默认返回ActionNotFound Error
 2019-01-04 17:36:54 +08:00
邱剑 fdd6c2d8a3 Merge pull request #882 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-secgroup-add-rule to release/2.5.0 
* commit '0ac4a7bff409c15d5c9e054b6fb7d7ec6d980f3a':
  支持批量添加安全组规则
 2019-01-04 13:18:46 +08:00
邱剑 e768975132 Merge pull request #878 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-image-require-override-pending-delete to release/2.5.0 
* commit '682d286aa133ec39f5b1284c0719fc9334483e7d':
  伪删除镜像的清理需要增加override-pending-delete的参数
 2019-01-04 13:17:44 +08:00
邱剑 f920267721 Merge pull request #876 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-server-require-override-pending-delete to release/2.4.0 
* commit 'd1d032411efb09a65ce6076ada84ddef172f8146':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
邱剑 3f08aab84a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f9202677218c02f3f5e7683a7ccab25c1db2d7db':
  host-list增加mem_cmtbound
  disk add allowdeleteitem
  修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-04 13:16:49 +08:00
屈轩 0ac4a7bff4 支持批量添加安全组规则 2019-01-04 12:30:53 +08:00
邱剑 9b74919020 Merge pull request #881 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-copy-from-signature-fail to release/2.5.0 
* commit 'dfc1e4fb9e9dd54e20d9bf490946fb4dc22bf196':
  update glance rpm requies
  minor fixes
  修正: image-import从阿里云导入镜像失败，原因是多设置了content-type的header
 2019-01-04 00:17:08 +08:00
Qiu Jian 71f47e7d32 minor fixes 2019-01-03 23:33:05 +08:00
邱剑 b5bdf62404 Merge pull request #877 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-glance-add-checksum-colume to release/2.5.0 
* commit '3d3301229186ee7d0b92b4f7876072d940e05559':
  images-list增加checksum字段
 2019-01-03 23:26:46 +08:00
Qiu Jian 791c9bd49d 修正: 
image-import从阿里云导入镜像失败，原因是多设置了content-type的header
 2019-01-03 22:58:24 +08:00
wanyaoqi f816954a0a Merge branch 'bugfix/wyq/fix-httperror-500-to-404' into bugfix/wyq/resolve-conflict 2019-01-03 20:27:58 +08:00
邱剑 db192ff493 Merge pull request #872 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.5.0 
* commit 'be2a3e5b746d4ecf0f480c68a5c9014380fac339':
  zhengjiajie sumit unused-resource
 2019-01-03 20:24:05 +08:00
邱剑 a58f97d184 Merge pull request #873 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-httperror-500-to-404 to release/2.4.0 
* commit 'f350abc1584bd9f6e22024196245714eae3eff18':
  fix httperror 500 to 40x
 2019-01-03 20:23:54 +08:00
Qiu Jian d1d032411e host-list增加mem_cmtbound 2019-01-03 20:13:47 +08:00
Qiu Jian 682d286aa1 伪删除镜像的清理需要增加override-pending-delete的参数 2019-01-03 20:10:49 +08:00
Qiu Jian 3d33012291 images-list增加checksum字段 2019-01-03 20:03:47 +08:00
Qiu Jian 929ea31d3e disk add allowdeleteitem 2019-01-03 20:00:50 +08:00
Qiu Jian 5b63de31bc 修正：1. 删除伪删除主机、磁盘需要override-pending-delete参数 2. 
joint-update支持auto_create参数 3. 删除主机时候detach磁盘，清理安全组
 2019-01-03 19:39:22 +08:00
邱剑 8ba1929e51 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'ea1bbc2444f8682991c97e95db85d9fc69797c61':
  capabilities 可用storage过滤
 2019-01-03 17:09:50 +08:00
邱剑 d26985a154 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5445791c11a69cfaac310b985a1d7ec9dba8474b':
  capabilities 可用storage过滤
 2019-01-03 17:09:50 +08:00
邱剑 5445791c11 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '8ba1929e518a13f49c310e969245e8b5071d2177':
  capabilities 可用storage过滤
 2019-01-03 17:09:50 +08:00
屈轩 ddde787707 capabilities 可用storage过滤 2019-01-03 16:58:18 +08:00
邱剑 e15faea047 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd4b544af762fcb64510cf578b318c2dc006328df':
  修复同步腾讯云storage type数据不准问题
 2019-01-03 16:23:40 +08:00
邱剑 d4b544af76 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '13a26a2316bd0d926984a3c0d9331a784113a618':
  修复同步腾讯云storage type数据不准问题
 2019-01-03 16:23:40 +08:00
屈轩 060ae5718b 修复同步腾讯云storage type数据不准问题 2019-01-03 16:19:41 +08:00
wanyaoqi f350abc158 fix httperror 500 to 40x 2019-01-03 14:08:56 +08:00
邱剑 9422e59ed1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9918896ac3aaf67572338b66eb1133c99142265a':
  补充admin resource列表
 2019-01-03 12:28:11 +08:00
邱剑 9918896ac3 Merge pull request #870 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-more-admin-resources to release/2.4.0 
* commit 'e6c93767f0ccb50e4edd0af7895b8a3f24ef9da4':
  补充admin resource列表
 2019-01-03 12:28:10 +08:00
zhengjiajie be2a3e5b74 zhengjiajie sumit unused-resource 2019-01-03 12:10:15 +08:00
TangBin ca5d98ebe8 修复华为云安全组同步及子账户多了一个无效记录的问题 2019-01-03 11:12:12 +08:00
Qiu Jian e6c93767f0 补充admin resource列表 2019-01-02 21:25:46 +08:00
邱剑 1a44405e1b Merge pull request #865 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-esxiagent-support to release/2.5.0 
* commit '1061b47afd0a060091a5fbd5526b295d05db4e60':
  修正：镜像通过PUT接口上传后，需要启动image convert tasks
  支持esxi agent，创建主机缺省用vmdk格式的镜像
 2019-01-02 21:05:58 +08:00
Rex Zhang 1d9f0a7954 hotfix; gofmt 2019-01-02 18:36:11 +08:00