opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,472 Commits 30 Branches 712 Tags
87c0e0b8982b06f7d9be8c044d6658affeba12ad
Commit Graph
4472 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 08285e4157 Merge pull request #1122 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-parameter-create-fix to release/2.5.0 
* commit 'ecc653f0a1de013d34da660e9494f51649fda0cc':
  parameter create fix
 2019-02-26 19:37:03 +08:00
TangBin ecc653f0a1 parameter create fix 2019-02-26 18:29:32 +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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
邱剑 2d53d2c569 Merge pull request #1114 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflicate-2.4.0 to release/2.4.0 
* commit '9c36d6945a8e8adf0cd07a5757aa1b6928694e92':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:47 +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
邱剑 554f7fa0a0 Merge pull request #1112 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-image-cache to release/2.2.0 
* commit '4c01b7ad2abef04cdc55c3ef0f1592e938befcbe':
  去除调试信息
  避免过滤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
邱剑 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
邱剑 93485e0ea8 Merge pull request #1109 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-order-bugfix to release/2.6.0 
* commit '129d568e59ee1afdb5158d9e9a315239f4f059d3':
  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
邱剑 ab61d33cf0 Merge pull request #1108 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-server-change-ipaddr-nolog to release/2.6.0 
* commit '61a38457340fb147b2126fbfd3ba8af96b38ce59':
  fix: add action log for server changing ipaddr
 2019-02-23 10:17:09 +08:00
wanyaoqi d1a860d7e6 fix online resize task 2019-02-23 10:02:51 +08:00
邱剑 4853efe7e7 Merge pull request #1094 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-region-bugfix to release/2.6.0 
* commit '6f43c49bdc08a67e5fcc2daf740224988a445d9b':
  不允许删除带快照的华为云硬盘
  华为云删除硬盘时删除快照
  华为云快照回滚bugfix
 2019-02-22 21:24:11 +08:00
Qiu Jian 61a3845734 fix: add action log for server changing ipaddr 2019-02-22 21:22:45 +08:00
邱剑 a294f7b42d Merge pull request #1107 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-fix-10 to release/2.6.0 
* commit '8b1595f18c5cd825b35838b6e0a3f1624a84fe0b':
  minor fix
 2019-02-22 17:54:31 +08:00
wanyaoqi 8b1595f18c minor fix 2019-02-22 16:19:55 +08:00
wanyaoqi 9da8dc58ba fix deploy bugs 2019-02-22 16:15:16 +08:00
万垚奇 0ac8043b1f Merge pull request #1105 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/scheduler-backuphost to release/2.6.0 
* commit 'ffd498566fc2db460445a27baff042ac6080bdd4':
  scheduler: fix backup master host schedule failed
 2019-02-22 12:31:39 +08:00
Zexi Li ffd498566f scheduler: fix backup master host schedule failed 2019-02-22 12:28:54 +08:00
万垚奇 7aab8b7b69 Merge pull request #1104 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/scheduler-backuphost to release/2.6.0 
* commit 'cc09b6e31ff3762836a83fb53ca68dbe98f1932e':
  scheduler: fix prefer backup host schedule fail
 2019-02-22 11:20:28 +08:00
Zexi Li cc09b6e31f scheduler: fix prefer backup host schedule fail 2019-02-22 11:18:05 +08:00
李泽玺 be11c0be15 Merge pull request #1103 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-validate-delete-error-meesage to release/2.6.0 
* commit '7c51f211e1c719c344a3598cbf1a5462402bdaf8':
  fix: validate delete condition returns nested httperrors
 2019-02-22 10:52:12 +08:00