opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 22:32:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,053 Commits 27 Branches 687 Tags
3fee2d00a809e73c699d38fd9d4064f12267aa3d
Commit Graph
355 Commits
Author SHA1 Message Date
TangBin 2848c38dee bugfix 2018-10-17 15:25:22 +08:00
TangBin feead7a53d add instances 2018-10-16 16:32:31 +08:00
TangBin 3a7fbf63fd add disk 2018-10-16 15:54:06 +08:00
TangBin 13396ce7c7 add host 2018-10-12 18:07:12 +08:00
TangBin 538a53cd3d init files 2018-09-26 18:31:55 +08:00
屈轩 6e966b90ee bugfix 2018-09-20 20:46:37 +08:00
邱剑 bacd9e7ce8 Merge pull request #121 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-azure to release/2.2.0 
* commit '6a54305eb24e7690fd62d24fae3f7d86a2663270':
  security sync
  resolve conflict
  resolve conflict
  resolve conflict
  resolve conflict
  image cache
  添加azure云盘创建代码
  update
  update
  添加创建vpc操作
  update
  用户id和subscriptionID放一起
  添加Azure安全组同步
  添加vendor更新
 2018-09-20 18:22:37 +08:00
邱剑 3f4c323b4b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7d019f0e45d5e50628f20240c8ada722b14b5eec':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
邱剑 7d019f0e45 Merge pull request #237 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.1.0 
* commit '3d64601d3978dd1571eba13f179396d33707c1a9':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
屈轩 6a54305eb2 resolve conflict 2018-09-20 16:29:20 +08:00
屈轩 c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
李泽玺 8ac87620fa Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '24e0f1867ff2f1818ac92203b49ed6dc13a96318':
  region: guest min memory size to 8MB
 2018-09-20 12:26:32 +08:00
李泽玺 24e0f1867f Merge pull request #240 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '79efc7e2d5e17cbcf84d415d9b017c355bf9540e':
  region: guest min memory size to 8MB
 2018-09-20 12:26:31 +08:00
Zexi Li 79efc7e2d5 region: guest min memory size to 8MB 2018-09-20 11:34:46 +08:00
邱剑 c88a8b55f3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '901eed81b83ccf79e088f94c85ba2781800c36a3':
  Managed server (aliyun) add manager/manager_id fields
 2018-09-20 11:14:23 +08:00
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +08:00
邱剑 b5ed2666eb Merge pull request #232 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '1b44153b1e8c2d6f957f44c0e066398dce026320':
  add validate snapshot name
  aliyun snapshot sync, create, delete; disk reset
 2018-09-20 00:12:52 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
邱剑 cead414257 Merge pull request #230 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-mcclient-error-2.2.0 to release/2.2.0 
* commit '65880ff857363e9ebad28cc0209a553dd78e1566':
  mcclient error
 2018-09-19 17:02:29 +08:00
屈轩 795f5441df security sync 2018-09-19 15:17:18 +08:00
wanyaoqi 1b44153b1e add validate snapshot name 2018-09-19 14:53:57 +08:00
邱剑 a6793a5fc5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f41931f252648ba7e28b63934ce5955725ad1135':
  修复磁盘类型颠倒问题
 2018-09-19 14:43:40 +08:00
邱剑 f41931f252 Merge pull request #234 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-disk-create-index to release/2.1.0 
* commit '26e1f888570b7a4d25a1184e4d1351ec2421470f':
  修复磁盘类型颠倒问题
 2018-09-19 14:43:40 +08:00
邱剑 86b44b670c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7d973135b33404fc50ec838adf33f52191eea567':
  region: ignore status to update container cpu and memory
 2018-09-19 14:28:38 +08:00
屈轩 26e1f88857 修复磁盘类型颠倒问题 2018-09-19 13:48:51 +08:00
Zexi Li 040722ac8c region: ignore status to update container cpu and memory 2018-09-19 11:55:18 +08:00
wanyaoqi bd7010b9e2 aliyun snapshot sync, create, delete; disk reset 2018-09-18 21:51:38 +08:00
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
屈轩 d992661a01 resolve conflict 2018-09-18 15:53:13 +08:00
TangBin 65880ff857 mcclient error 2018-09-18 14:50:45 +08:00
邱剑 fa5290f4e4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0 
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
Qiu Jian 70be87bbe5 修正：qutoa的images使用量不准确 2018-09-17 22:36:50 +08:00
邱剑 02ae6aacb3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6061860fed82f4a62d5e19ab895ff20e4f77085f':
  region: add network port usage
 2018-09-17 12:31:26 +08:00
Zexi Li 047217a52d region: add network port usage 2018-09-17 12:19:22 +08:00
邱剑 34420c83ab Merge pull request #197 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit 'c02425506d02960a60d849be53d9904b4062d20b':
  fix convert
  if disk resized, update disk size to snapshot size did not auto snapshot when guest not in status ready or running add snapshot-show
  disk reset minor fixs
  fix code
 2018-09-17 12:16:15 +08:00
邱剑 69f9492e2d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1a733935b2a43641cb501d4f64a40c54c9fc32d1':
  修正：eip操作失败后没有正确恢复状态
 2018-09-17 11:43:58 +08:00
Qiu Jian c2111bcc6e 修正：eip操作失败后没有正确恢复状态 2018-09-17 09:16:49 +08:00
邱剑 18068b0c1e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:39 +08:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0 
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:38 +08:00
Qiu Jian fc5b3e68db minior fixes 2018-09-15 18:12:20 +08:00
Qiu Jian f43c278d90 guestdisk support index filter 2018-09-15 18:04:08 +08:00
邱剑 4101fa1bc0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3ff6b1d37cf91b19ea85e95371b38a584a7676b8':
  region: user usage
 2018-09-15 18:03:07 +08:00
Zexi Li 1c01d7b45f region: user usage 2018-09-15 17:50:59 +08:00
Qiu Jian c624d4ec6c 修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root 
no-account-init无效 3. 其他问题...
 2018-09-15 17:05:17 +08:00
屈轩 2e1d40f70a resolve conflict 2018-09-15 14:11:49 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
邱剑 86eca9166f Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
  adjust import order
  fix typos
  增加eip操作的状态变化
  network/wire/vpc增加zone/region信息
  修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
 2018-09-15 12:53:10 +08:00