opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,611 Commits 27 Branches 687 Tags
39c0ac797ba9ad5ab0ab0c3ad804c7bb3eaabb62
Commit Graph
2977 Commits
Author SHA1 Message Date
wanyaoqi 39c0ac797b add host metadat, radix minor fix 2019-02-27 12:17:37 +08:00
wanyaoqi 40dbc8d478 recode radix tree 2019-02-27 12:16:41 +08:00
邱剑 33f272eab3 Merge pull request #1121 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-add-sku-list-query-condition to release/2.7.0 
* commit 'ff26e3f1e60d615f2a193e4fc7a5f6da812e9c2b':
  skus extra details querys add cache
  sku list add more query
 2019-02-26 20:58:38 +08:00
TangBin ff26e3f1e6 skus extra details querys add cache 2019-02-26 20:56:29 +08:00
邱剑 8480790c1d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '87c0e0b8982b06f7d9be8c044d6658affeba12ad':
  parameter create fix
 2019-02-26 19:37:04 +08:00
邱剑 87c0e0b898 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '08285e415710357952daf77c48e7a0c9b8eda5ee':
  parameter create fix
 2019-02-26 19:37:03 +08:00
TangBin ecc653f0a1 parameter create fix 2019-02-26 18:29:32 +08:00
TangBin 82db81debc sku list add more query 2019-02-26 17:47:38 +08:00
邱剑 2146728337 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6ced91d2db24c7985266bd4e498ee38933ba428b':
  fix: ignore syncing storage when syncing vmware hosts
 2019-02-25 17:31:42 +08:00
邱剑 6ced91d2db Merge pull request #1117 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-sync-hoststorage-ignore-storage to release/2.6.0 
* commit '59cab59e5ea800392c87e311d9e15ee7ea26aa17':
  fix: ignore syncing storage when syncing vmware hosts
 2019-02-25 17:31:42 +08:00
邱剑 a3af2f8859 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '044fbf14acd4482b0f55e4853d065a6388c1c9d4':
  Remove virtualSize column from images_tbl
  fix: unify image.min_disk unit to MB
 2019-02-25 17:31:32 +08:00
邱剑 044fbf14ac Merge pull request #1119 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-min-disk-in-mb to release/2.6.0 
* commit '329e394c45f41464ce26764fdb7b1ab8d70437b8':
  Remove virtualSize column from images_tbl
  fix: unify image.min_disk unit to MB
 2019-02-25 17:31:32 +08:00
邱剑 9c93319c1f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '43be48cacc0342e026bb23eed23d85f2f7638944':
  prepay vm bugfix
  add more log
  add more log  && imcp bugfix
 2019-02-25 17:31:11 +08:00
邱剑 43be48cacc Merge pull request #1118 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-icmp-bugfix to release/2.6.0 
* commit '7d4faf7038223e6ecae1827c2504df9a4eeb663d':
  prepay vm bugfix
  add more log
  add more log  && imcp bugfix
 2019-02-25 17:31:10 +08:00
邱剑 1d3217b908 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '842af422f9572bb80cffae3e0982fe92e14c2de7':
  fix online resize task
  fix deploy bugs
 2019-02-25 17:14:59 +08:00
邱剑 842af422f9 Merge pull request #1116 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit 'd1a860d7e69eb72d8ba580d944dfc0853d9ffa3f':
  fix online resize task
  fix deploy bugs
 2019-02-25 17:14:59 +08:00
邱剑 67f498e35a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f7dd98d486a98efd0ddaed0ff0030ea060a77776':
  set http idle conn timeout
  add delete backup on switch
  add verify dirty servers
  minor fix
 2019-02-25 17:12:06 +08:00
邱剑 f7dd98d486 Merge pull request #1115 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20190223 to release/2.6.0 
* commit '7425e13bc692f2f42d74be60e68a3b5d23649705':
  set http idle conn timeout
  add delete backup on switch
  add verify dirty servers
  minor fix
 2019-02-25 17:12:06 +08:00
Qiu Jian 329e394c45 Remove virtualSize column from images_tbl 2019-02-25 17:06:44 +08:00
Qiu Jian 92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
wanyaoqi 7425e13bc6 set http idle conn timeout 2019-02-25 16:40:28 +08:00
TangBin 7d4faf7038 prepay vm bugfix 2019-02-25 16:01:18 +08:00
Qiu Jian 59cab59e5e fix: ignore syncing storage when syncing vmware hosts 2019-02-25 15:54:41 +08:00
邱剑 4aef5b83cd Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f878b57fab9d48b35ce0a2615ce915f887200511':
  fix: schedule fail should post actionlog
  fix: action log always success
  fix: cannot undo recycle of expired prepaid vm
  fix: eip support prepaid charge type
 2019-02-25 15:25:30 +08:00
邱剑 f878b57fab Merge pull request #1110 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20190223 to release/2.6.0 
* commit '4c2e9996c13ce2e75095b4cfa423faaf2b2ff326':
  fix: schedule fail should post actionlog
  fix: action log always success
  fix: cannot undo recycle of expired prepaid vm
  fix: eip support prepaid charge type
 2019-02-25 15:25:29 +08:00
wanyaoqi 57028a9912 add delete backup on switch 2019-02-25 15:20:27 +08:00
wanyaoqi d855772869 add verify dirty servers 2019-02-25 14:26:52 +08:00
wanyaoqi 27d69ce07e minor fix 2019-02-25 13:34:22 +08:00
邱剑 3f366b2342 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '2347404b3c41bab65cd1a9513983c0b34642e82d':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:49 +08:00
邱剑 fb6d410b2a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2d53d2c569dedbe0d09773b5aca46305331fd68f':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:48 +08:00
邱剑 2347404b3c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'fb6d410b2a77da9334478155caa728c76301629f':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:48 +08:00
TangBin 65d1d72f98 add more log 2019-02-25 12:08:30 +08:00
屈轩 9c36d6945a 冲突解决 2019-02-25 12:06:38 +08:00
邱剑 a7db0fe024 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '554f7fa0a07329180a878f3bf9d1fe9e04bd1203':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 11:56:01 +08:00
屈轩 4c01b7ad2a 去除调试信息 2019-02-25 11:51:21 +08:00
屈轩 7420fddad5 避免过滤cloudprovider失效 2019-02-25 11:37:16 +08:00
邱剑 209589283e Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '246f47a988124837ceade544121497b8d3c14e95':
  fix purge backup guest
  set http connect timeout
  set default http client Timeout
 2019-02-25 11:21:08 +08:00
邱剑 246f47a988 Merge pull request #1111 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20190223 to release/2.6.0 
* commit '6e9d54c3f30017d804a7bb49f4517ae19a772c66':
  fix purge backup guest
  set http connect timeout
  set default http client Timeout
 2019-02-25 11:21:05 +08:00
TangBin 8c02f86eec add more log && imcp bugfix 2019-02-25 10:27:30 +08:00
wanyaoqi 6e9d54c3f3 fix purge backup guest 2019-02-24 14:22:49 +08:00
wanyaoqi c60cffbfa3 set http connect timeout 2019-02-24 12:35:19 +08:00
wanyaoqi 0474dad972 set default http client Timeout 2019-02-23 22:27:50 +08:00
Qiu Jian 4c2e9996c1 fix: schedule fail should post actionlog 2019-02-23 21:01:05 +08:00
Qiu Jian 85b1e57324 fix: action log always success 2019-02-23 21:00:40 +08:00
Qiu Jian 67540f32b4 fix: cannot undo recycle of expired prepaid vm 2019-02-23 18:45:33 +08:00
Qiu Jian 66634a4dfa fix: eip support prepaid charge type 2019-02-23 18:45:04 +08:00
邱剑 294e62b4a6 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '93485e0ea8d381ebeccaf92a6a0b9e161a9f414a':
  rename min disk
  order fix
 2019-02-23 18:13:21 +08:00
TangBin 129d568e59 rename min disk 2019-02-23 18:11:13 +08:00
TangBin 01b7c11aba order fix 2019-02-23 17:59:32 +08:00
邱剑 e94e8e8246 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ab61d33cf06ed3ad0d6cfa4a9bc6f6fef2c84987':
  fix: add action log for server changing ipaddr
 2019-02-23 10:17:10 +08:00