opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
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
邱剑 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
邱剑 d764417ce8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4853efe7e7d57ec648c27ed9349dea798a3a356a':
  不允许删除带快照的华为云硬盘
  华为云删除硬盘时删除快照
  华为云快照回滚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
邱剑 9bed859d32 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'a294f7b42d67342a7e7b9787b616892d65bf95dd':
  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
万垚奇 516d2566a0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '0ac8043b1fe5124eeb0ddc2a935e3339e40030d6':
  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
邱剑 0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +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
万垚奇 65f7f660ad Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '7aab8b7b69248eeadcd0e18fc7819cbcef740fb7':
  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
李泽玺 6a0444335c Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'be11c0be1556295191b8b7fa3c93f41572cfcc34':
  fix: validate delete condition returns nested httperrors
 2019-02-22 10:52:12 +08:00
Qiu Jian 7c51f211e1 fix: validate delete condition returns nested httperrors 2019-02-22 10:18:10 +08:00
邱剑 34bb4bc4b3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bcc47fd6d34a7b622a83718c491ddd8f9d624671':
 2019-02-22 10:04:34 +08:00
邱剑 bcc47fd6d3 Merge pull request #1098 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit '97247c4c8239598fc2e6799c12fccdf69dc20864':
 2019-02-22 10:04:33 +08:00
李泽玺 a73b1e14fd Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'd9f9cd0ef1b10ef1b9261518dccc7faab31d3a64':
  fix: specify notify user&groups domain as prefix
  fix: server list filter by manager returns 500
 2019-02-22 09:56:17 +08:00
Qiu Jian bf071e2fea fix: specify notify user&groups domain as prefix 2019-02-22 09:27:05 +08:00
Qiu Jian 3de16f096c fix: server list filter by manager returns 500 2019-02-22 01:15:33 +08:00
邱剑 97247c4c82 Merge pull request #1092 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/switch-to-backup to release/2.6.0 
* commit '9ca00e1646e299eb4a6fef7aa75b3457010e1845':
  switch to backup add status
 2019-02-21 20:43:12 +08:00
TangBin 6f43c49bdc 不允许删除带快照的华为云硬盘 2019-02-21 20:15:43 +08:00
邱剑 b70ebbe3b3 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ebec65e46fe1e8a4f2393e0a2827dbd5e634b9d2':
  minor fix
  fix: find empty endpoints due to invalid duplicate service
 2019-02-21 19:53:11 +08:00
邱剑 1d68676e40 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'b70ebbe3b3bbd90633c93e6f4d377f40d3b99aca':
  minor fix
  fix: find empty endpoints due to invalid duplicate service
 2019-02-21 19:53:11 +08:00
邱剑 ebec65e46f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '503729880a22f5cd05439ac180ab7c72b0b55193':
  minor fix
  fix: find empty endpoints due to invalid duplicate service
 2019-02-21 19:53:10 +08:00
Qiu Jian c624341b19 minor fix 2019-02-21 18:48:50 +08:00
Qiu Jian 2a6737061d fix: find empty endpoints due to invalid duplicate service 2019-02-21 18:16:17 +08:00
邱剑 e6594d0572 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '0fa01c43b19362d4a085a2ba8d3a4252b1d23d45':
  fix create backup
 2019-02-21 18:10:24 +08:00
邱剑 0fa01c43b1 Merge pull request #1096 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-fix-20190221 to release/2.6.0 
* commit 'ee028422f70cd33f40af56caace99cd8eb0d754d':
  fix create backup
 2019-02-21 18:10:23 +08:00
TangBin 4f8a2fafa0 华为云删除硬盘时删除快照 2019-02-21 17:40:52 +08:00
wanyaoqi ee028422f7 fix create backup 2019-02-21 17:32:39 +08:00
邱剑 7ce79e2f34 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'b3ddb964be72538ef802bc3865301bf7e0087dec':
  识别openstack protocol
 2019-02-21 15:27:09 +08:00
邱剑 b3ddb964be Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6c6f80488f94083da56d6a60ca1f96d7231f653e':
  识别openstack protocol
 2019-02-21 15:27:09 +08:00
屈轩 f4cf4ab93d 识别openstack protocol 2019-02-21 15:25:01 +08:00
邱剑 f09fcec33a Merge pull request #1092 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/switch-to-backup to release/2.6.0 
* commit '9ca00e1646e299eb4a6fef7aa75b3457010e1845':
  switch to backup add status
 2019-02-21 12:35:37 +08:00
邱剑 952b16be25 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f09fcec33a17d4138107d38998d3cb05f81a1a4f':
  switch to backup add status
 2019-02-21 12:35:37 +08:00
邱剑 2fcd32ed3a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '9e3bab240c262bab4d2b58dd929c293a7035d6e1':
  fix: esxi references2Objects refer nil objects
 2019-02-21 12:34:02 +08:00
邱剑 9e3bab240c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'd84a5fc16a4aef6d0b71e8a27e4b935f881fd55f':
  fix: esxi references2Objects refer nil objects
 2019-02-21 12:34:02 +08:00
邱剑 d84a5fc16a Merge pull request #1087 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-reference-nil-objects to release/2.5.0 
* commit '72d8dd8961e55a0190330bfea085710b1e77d4ba':
  fix: esxi references2Objects refer nil objects
 2019-02-21 12:34:02 +08:00