opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-25 10:16:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,001 Commits 30 Branches 710 Tags
05ae3df45810effefcabbf70be35c213f4c52c11
Commit Graph
692 Commits
Author SHA1 Message Date
屈轩 05ae3df458 Merge branch 'hotfix/qx-azure-name-change' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-11-14 21:25:12 +08:00
屈轩 0764bed086 避免更新Azure guest名称 2018-11-14 21:24:50 +08:00
屈轩 237c128456 Merge branch 'bugfix/qx-azure-keypair' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-11-14 15:42:39 +08:00
屈轩 ea620ef7ca 避免Azure绑定秘钥时stop机器 2018-11-14 15:40:52 +08:00
邱剑 04810d11c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6ca618d539f2f61fdc8c19236aaba4dca0769683':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:25 +08:00
邱剑 6ca618d539 Merge pull request #487 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-optimization to release/2.3.0 
* commit '1ff0252f3f8ad3ae0db03d8f0d02c084270b5848':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:24 +08:00
邱剑 8a146a92f9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '11d305933001cdd41adde0cf3bb7d5c0319ade85':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 21097e9f96 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70e64329e93957a4772b468cfd7ad68c4ddf64e2':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 70e64329e9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a146a92f981d3fb318ab33fc2a0efde1ae77740':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 11d3059330 Merge pull request #490 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-short-desc to release/2.1.0 
* commit '36dda2a5b4ac268280c3e660d29666dcc6a68060':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:02 +08:00
邱剑 c61a4c36c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '630b5df49e96d23d6b87a08fbd9572971be73587':
  修正：删除主机时忽略停机错误
  scheduler: filter host when cloudprovider status not connected
 2018-11-13 21:58:46 +08:00
Qiu Jian db9fd8aeb3 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181113-2.3.0 
Conflicts:
	pkg/scheduler/db/models/default.go
 2018-11-13 19:10:40 +08:00
邱剑 13703b6072 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '62f27f05f570292866f6a140a4dc4b84b2eee889':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:28 +08:00
邱剑 62f27f05f5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e3443851adc4510e2944d3e77cb323289dcf3aa8':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:27 +08:00
Qiu Jian 36dda2a5b4 补充主机计费的shortdesc参数 2018-11-13 18:21:55 +08:00
屈轩 1ff0252f3f 优化cloudprovider删除enable、disable逻辑 2018-11-13 16:56:40 +08:00
Qiu Jian cda1edfc45 修正：删除主机时忽略停机错误 2018-11-13 16:16:20 +08:00
邱剑 0c9d65cdad Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'dbbcb7a4be018e97ff57606ce99e068ee54cbdfe':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +08:00
邱剑 dbbcb7a4be Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '81b6682559969900b349d2c90c3498699a54f106':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +08:00
邱剑 81b6682559 Merge pull request #477 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-changeconfig to release/2.2.0 
* commit '8a8ff13e919587e2c702ef4725f9502369598af9':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +08:00
邱剑 c3371298f5 Merge pull request #476 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-changeconfig to release/2.1.0 
* commit '008d6f10f51fceba973bb3c56edeca757dca8436':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:38:47 +08:00
邱剑 b8bd00bf06 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '84d7e390d476c53d19bb7a2f6cb67537645b693a':
  修正：host undo convert失败
 2018-11-13 11:38:02 +08:00
邱剑 84d7e390d4 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'e267bc77f2f130b62bc088b9167633c6c5761e8e':
  修正：host undo convert失败
 2018-11-13 11:38:02 +08:00
邱剑 e267bc77f2 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6cefc7dc0205c1aba777ebb63576fb099408938d':
  修正：host undo convert失败
 2018-11-13 11:38:02 +08:00
邱剑 6cefc7dc02 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '1c9b0ce6d6ecce2f1faeb9fe643034d463761fe2':
  修正：host undo convert失败
 2018-11-13 11:38:01 +08:00
屈轩 8a8ff13e91 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:29:48 +08:00
屈轩 008d6f10f5 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:26:33 +08:00
Qiu Jian 00f5d3ba54 修正：host undo convert失败 2018-11-13 00:25:26 +08:00
邱剑 ca5571e383 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bc66c01ef343b4de09d341079041cd21294f3e38':
  根据腾讯云主机状态判断磁盘是否可以resize
 2018-11-12 22:03:46 +08:00
邱剑 bc66c01ef3 Merge pull request #474 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit 'fbf5f6825f31cfcc0e8222e68e91287aae38ad74':
  根据腾讯云主机状态判断磁盘是否可以resize
 2018-11-12 22:03:46 +08:00
邱剑 c2bc969070 Merge pull request #473 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-disk-resize-validate to release/2.2.0 
* commit '4ae235570df4f25c1b0d6b67a5cdc1132a589b10':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +08:00
邱剑 c03130fe9c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '86dd2125f16b344c922cbcab831da2378023dee7':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +08:00
邱剑 86dd2125f1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c2bc969070c2f14a796255c6fcbe01528a8ebf2e':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +08:00
邱剑 85789abc1e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f5529c14f70e92f2e5d9f4c702815466cd78066d':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:04 +08:00
邱剑 bde729b202 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '737894f5cb418b3f65400939da18551befa10fd2':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
邱剑 f5529c14f7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'bde729b202162ebfad989a79071891840e163113':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
屈轩 fbf5f6825f 根据腾讯云主机状态判断磁盘是否可以resize 2018-11-12 21:52:25 +08:00
屈轩 4ae235570d 根据Azure主机状态判断磁盘是否可以resize 2018-11-12 21:46:11 +08:00
屈轩 593e8c9fd8 根据主机状态判断磁盘是否可以resize 2018-11-12 21:28:50 +08:00
李泽玺 9ea481119d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6301b2b6af53ac7422659bb72be2a87e0523bbcf':
  support schedule disk
 2018-11-12 21:16:40 +08:00
李泽玺 6301b2b6af Merge pull request #467 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-schedule-disk to release/2.3.0 
* commit '0244e70516fa14222350673c757ba279d687eb27':
  support schedule disk
 2018-11-12 21:16:39 +08:00
邱剑 06ee675896 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c6af80d1247c41ee4903ab2cc89c7f11a14cefb1':
  适配腾讯云AWS主机操作状态
 2018-11-12 20:13:47 +08:00
邱剑 c6af80d124 Merge pull request #464 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-aws-guest-op to release/2.3.0 
* commit '44e735b8934777247668779a5b63f470481dcb17':
  适配腾讯云AWS主机操作状态
 2018-11-12 20:13:46 +08:00
邱剑 ae5422dc90 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '200c268069404974b02ef8722534bad6c746be21':
  适配裸金属服务器操作状态
 2018-11-12 20:13:33 +08:00
邱剑 2f9e835f3e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '248263c0c7e4e44f013f02c6db8fed254edcb5fa':
  适配裸金属服务器操作状态
 2018-11-12 20:13:32 +08:00
邱剑 200c268069 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '2f9e835f3ec3a6c3e59bdf03e3f08e21df07c0d3':
  适配裸金属服务器操作状态
 2018-11-12 20:13:32 +08:00
屈轩 4339e38e69 适配裸金属服务器操作状态 2018-11-12 20:11:59 +08:00
屈轩 44e735b893 适配腾讯云AWS主机操作状态 2018-11-12 20:02:59 +08:00
邱剑 7877dbde49 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd6e03f2c0e18b17d20881e6b30bddcf219c2c126':
  guest适配操作状态
 2018-11-12 19:50:22 +08:00
邱剑 6e35123634 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6f9805834bc6824d44ac42e6f51202b147765b0a':
  guest适配操作状态
 2018-11-12 19:50:21 +08:00