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
3,750 Commits 27 Branches 687 Tags
beb2ac66b53940afad5f415f231c4c6329b02bc4
Commit Graph
3750 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian beb2ac66b5 增加：1. 将公有云标准镜像同步到本地 2. 可以从公有云标准镜像创建主机 3. 
在公有云缓存镜像时遵守公有云镜像的配额
 2019-01-21 09:21:02 +08:00
邱剑 7b0d548651 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e3ddd6a201e8d98d4718a5aa17f86c11bd7c719c':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:26 +08:00
邱剑 e3ddd6a201 Merge pull request #943 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-more-details to release/2.5.0 
* commit '5c55f0633af1a750dbd6e28f6b759991fe3ea467':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:26 +08:00
屈轩 5c55f0633a 取消重复的region信息 2019-01-18 16:26:14 +08:00
屈轩 2c72ca35d3 返回eip账号信息 2019-01-18 16:25:13 +08:00
邱剑 b0a0ae12b8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '3a47eef8585e103588f7b8c9e4bf9efdb1c96914':
  remove key index
 2019-01-18 16:03:11 +08:00
邱剑 3a47eef858 Merge pull request #942 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/remove-key-index to release/2.5.0 
* commit '2b4fac6a8755999b4132bf02e1e0a5b765efe4d9':
  remove key index
 2019-01-18 16:03:10 +08:00
邱剑 c7ac453123 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '85662ca995da730efb90a359e6e287a0761a341c':
  climc 更新
  后端对公有云账号密码信息重组
 2019-01-18 14:44:22 +08:00
邱剑 85662ca995 Merge pull request #941 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount to release/2.5.0 
* commit '8f65712632d552b6c5ed65b2c6913438469061b2':
  climc 更新
  后端对公有云账号密码信息重组
 2019-01-18 14:44:21 +08:00
屈轩 8f65712632 climc 更新 2019-01-18 10:57:36 +08:00
wanyaoqi 2b4fac6a87 remove key index 2019-01-17 22:07:24 +08:00
屈轩 b68bbef09d 后端对公有云账号密码信息重组 2019-01-17 16:23:00 +08:00
邱剑 11fc2afc33 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '000e461bb419844a58d9f335e810eff58d2af2c9':
  fix network merge
 2019-01-17 12:07:08 +08:00
邱剑 000e461bb4 Merge pull request #940 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-network-merge to release/2.5.0 
* commit '9201d7fb99b417e1e8d177477c692d4d103011e7':
  fix network merge
 2019-01-17 12:07:08 +08:00
wanyaoqi 9201d7fb99 fix network merge 2019-01-17 11:51:29 +08:00
邱剑 9df488c256 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '1d5ade88f6a6b397903e55bfa85afcb2e7a7f48d':
  修正：esxi host名称不使用full domain name
 2019-01-16 21:52:17 +08:00
邱剑 1d5ade88f6 Merge pull request #938 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-esxi-host-get-name-shorten to release/2.5.0 
* commit '069394b2ad7b45876ddbf9b64622ae8dae47edb5':
  修正：esxi host名称不使用full domain name
 2019-01-16 21:52:17 +08:00
Qiu Jian 069394b2ad 修正：esxi host名称不使用full domain name 2019-01-16 20:15:43 +08:00
李泽玺 7c775df9e7 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'fddab3bf8166f461f7fc99b1bcdc7b5292078fb9':
  update vendor
 2019-01-16 18:06:58 +08:00
李泽玺 fddab3bf81 Merge pull request #937 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-update-vendor-20190116 to release/2.5.0 
* commit '305baf5d5f08b00b5aa744f77d63fb63a42f80f7':
  update vendor
 2019-01-16 18:06:58 +08:00
Qiu Jian 305baf5d5f update vendor 2019-01-16 18:04:40 +08:00
邱剑 bf4159d015 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '006c3a20bfa414385205a619ecbe077cf322e967':
  修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建
 2019-01-16 15:33:38 +08:00
邱剑 006c3a20bf Merge pull request #933 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-storage-is-sys-disk-store to release/2.5.0 
* commit 'f3b85dcb7bf7b88afa5005c9b402e4564e6b003b':
  修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建
 2019-01-16 15:33:38 +08:00
邱剑 a4a55be7fd Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8d6a2b6527b41bf17655656c80f0461f033b38e2':
  lb: 改正health_check_{domain,path}校验
 2019-01-16 12:35:42 +08:00
邱剑 52483f2384 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'a4a55be7fdd4ab52e69b2cab42f0ad22acf675ed':
  lb: 改正health_check_{domain,path}校验
 2019-01-16 12:35:42 +08:00
邱剑 8d6a2b6527 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1eec7ce09428572dd748d58f025f4055021fe6e6':
  lb: 改正health_check_{domain,path}校验
 2019-01-16 12:35:42 +08:00
邱剑 1eec7ce094 Merge pull request #936 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '82796ed1e534b7e59dd57f6fa2a3b8666118b8ec':
  lb: 改正health_check_{domain,path}校验
 2019-01-16 12:35:41 +08:00
邱剑 011c8269a9 Merge pull request #935 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-delete-eip-associate-with-invalid-vm to release/2.5.0 
* commit 'c90d6b1acdb646bccbc3b4a2289070a6ce09ceef':
  make dissociate action idempotennt
  修正：当eip关联主机无效时，允许删除该eip
 2019-01-16 12:34:40 +08:00
邱剑 e4b99b67f5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '011c8269a97a98c7a3d55c8b2c7e951ebbc4a93b':
  make dissociate action idempotennt
  修正：当eip关联主机无效时，允许删除该eip
 2019-01-16 12:34:40 +08:00
Yousong Zhou 82796ed1e5 lb: 改正health_check_{domain,path}校验 2019-01-16 03:53:46 +00:00
万垚奇 20e790f158 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e81acea0fc97526982536e5f1b960893372e352d':
  增加disk-save命令
 2019-01-16 10:46:21 +08:00
万垚奇 e81acea0fc Merge pull request #934 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-add-disk-save-climc to release/2.5.0 
* commit '302be0e57640dc4cb264844beab12e86ec83c212':
  增加disk-save命令
 2019-01-16 10:46:20 +08:00
Qiu Jian c90d6b1acd make dissociate action idempotennt 2019-01-16 00:55:29 +08:00
Qiu Jian 1287af044f 修正：当eip关联主机无效时，允许删除该eip 2019-01-16 00:48:22 +08:00
Qiu Jian 302be0e576 增加disk-save命令 2019-01-15 23:47:02 +08:00
Qiu Jian f3b85dcb7b 修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +08:00
邱剑 3705b4f507 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '35adcede87d21100a0b331f9ebe72ebddcdfb9f6':
  修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除
 2019-01-15 17:11:30 +08:00
邱剑 35adcede87 Merge pull request #929 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-exclude-prepaid-fake-storage-from-available-storage-types to release/2.5.0 
* commit '7bdaac6882dc34cd8df62e584193cd86ede6cfeb':
  修正：将包年包月资源池的虚拟存储从可用区域的存储列表中排除
 2019-01-15 17:11:30 +08:00
邱剑 0780eeba6e Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '95e8e3ad6a25e23d643b269d10c2f10a143e59d7':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
 2019-01-15 17:10:55 +08:00
邱剑 95e8e3ad6a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '21ac2061b8ebf2bd0525ee837968f87b52293a9f':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
 2019-01-15 17:10:55 +08:00
邱剑 21ac2061b8 Merge pull request #931 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.4.0 
* commit '4adae9bd8867c9f0249cb91f9212574656650aa9':
  lbagent: fix typo in log
  lbagent: use encoding/json for {,de}serialization
  lbagent: 改正cloudcommon.CommonOptions使用
  lbagent: 改正isempty()使用
 2019-01-15 17:10:54 +08:00
邱剑 bd71944432 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '46b5a90ad48f1b61a04e2b2ce868717f67324071':
  避免前端更改描述字段后刷新没有相关字段
 2019-01-15 17:04:07 +08:00
邱剑 46b5a90ad4 Merge pull request #930 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgorup-detail to release/2.5.0 
* commit '3b60fa1238491b1bf41b491b16adbb459cee0912':
  避免前端更改描述字段后刷新没有相关字段
 2019-01-15 17:04:07 +08:00
邱剑 bc063ae2bf Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'a96709816cc10c81ff2440bebd2e8080518798a6':
  允许zone-list显示location字段
 2019-01-15 17:03:26 +08:00
邱剑 a96709816c Merge pull request #932 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-zone-location to release/2.5.0 
* commit '2794f188e585e4456c7e8d34a7a743f4594c4d07':
  允许zone-list显示location字段
 2019-01-15 17:03:26 +08:00
屈轩 2794f188e5 允许zone-list显示location字段 2019-01-15 16:09:01 +08:00
Yousong Zhou 4adae9bd88 lbagent: fix typo in log 2019-01-15 08:00:44 +00:00
Yousong Zhou 10a388e6df lbagent: use encoding/json for {,de}serialization 2019-01-15 08:00:44 +00:00
Yousong Zhou 082cff6acd lbagent: 改正cloudcommon.CommonOptions使用 2019-01-15 08:00:44 +00:00
Yousong Zhou 67a9a1921d lbagent: 改正isempty()使用 2019-01-15 08:00:44 +00:00