Commit Graph
6987 Commits
Author SHA1 Message Date
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
wanyaoqi 0865d53297 temp 2019-01-18 18:02:00 +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
邱剑 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
屈轩 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
wanyaoqi 9201d7fb99 fix network merge 2019-01-17 11:51:29 +08:00
wanyaoqi a57563e348 replace back quota with double quota 2019-01-17 11:36:02 +08:00
wanyaoqi ae6430bd04 use procutils replace exec 2019-01-17 10:46:53 +08:00
Qiu Jian 069394b2ad 修正:esxi host名称不使用full domain name 2019-01-16 20:15:43 +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
wanyaoqi 6810bd8b50 fix code 2019-01-16 16:02:21 +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
Zexi Li 156517ca7a IsolatedDevice management 2019-01-16 15:30:37 +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
邱剑 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
李泽玺 edddf90327 Merge pull request #13 in ~WANYAOQI/onecloud from feature/wyq/host-server-v2 to feature/host-baremetal-v2
* commit 'be7f8f1e95d8156e29abc601ce03aaf58ad71139':
  host complie success
  temp commit
2019-01-16 12:15:04 +08:00
wanyaoqi be7f8f1e95 host complie success 2019-01-16 12:09:06 +08:00
Yousong Zhou 82796ed1e5 lb: 改正health_check_{domain,path}校验 2019-01-16 03:53:46 +00: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 f3b85dcb7b 修正:storage增加IsSysDiskStore属性,标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建 2019-01-15 22:42:55 +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
邱剑 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
邱剑 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
屈轩 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
屈轩 3b60fa1238 避免前端更改描述字段后刷新没有相关字段 2019-01-15 15:48:23 +08:00
Qiu Jian 7bdaac6882 修正:将包年包月资源池的虚拟存储从可用区域的存储列表中排除 2019-01-15 12:14:07 +08:00
邱剑 fef1f193a1 Merge pull request #925 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-os-type-case-insensitive to release/2.5.0
* commit '98bbe1a5c3d54dfb786729e82d6abaa6dc2c0a6d':
  image os type caseinsensitive
2019-01-15 12:03:30 +08:00
wanyaoqi f7ee73934a fix network split 2019-01-15 11:43:29 +08:00
wanyaoqi 1867584335 temp commit 2019-01-15 11:31:32 +08:00
Qiu Jian d6a416acb2 修正:status检查主体引用错误 2019-01-15 10:51:30 +08:00
Qiu Jian 05a69ac0be add os-type list filter 2019-01-14 22:39:32 +08:00
邱剑 f099e1cbd8 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '8d9f37af4a42398c48256b31516b178aa5543646':
  gofmt
  增加挂载磁盘、卸载磁盘日志
2019-01-14 21:24:13 +08:00
Qiu Jian 98bbe1a5c3 image os type caseinsensitive 2019-01-14 21:23:05 +08:00
Zhang Dongliang 4a17ff0e6b gofmt 2019-01-14 17:26:55 +08:00
Zhang Dongliang 83b6855d86 增加挂载磁盘、卸载磁盘日志 2019-01-14 17:25:24 +08:00
李泽玺 6bbd866586 Merge pull request #12 in ~WANYAOQI/onecloud from feature/wyq/host-server-v2 to feature/host-baremetal-v2
* commit '71856e430e551217a4e9fd009137b20b134c79ed':
  guest migrate snapshot
  temp
2019-01-14 16:45:04 +08:00
wanyaoqi 71856e430e guest migrate snapshot 2019-01-14 16:44:01 +08:00
邱剑 55f5beb1cf Automatic merge from release/2.4.0 -> release/2.5.0
* commit '1570cfec28fb6967821a9b69fd7a4bc948d386e0':
  region: host list 去掉 container 计数
2019-01-14 15:13:08 +08:00
TangBin affd9bde8b fix huawei client package name error 2019-01-14 14:20:15 +08:00
Zexi Li ac02074cde region: host list 去掉 container 计数 2019-01-14 13:40:35 +08:00