opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,761 Commits 27 Branches 687 Tags
dbbcb7a4be018e97ff57606ce99e068ee54cbdfe
Commit Graph
1223 Commits
Author SHA1 Message Date
邱剑 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
邱剑 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
唐斌 b1acc90be3 Merge pull request #468 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-fix-make-regiondns-error to release/2.3.0 
* commit '6599ddc53b9a0ddb46c85ce08238c6e90c3e4b03':
  rm transitive dependents
  fix depends
  fix region-dns build error
 2018-11-13 10:51:11 +08:00
屈轩 8a8ff13e91 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:29:48 +08:00
Qiu Jian 00f5d3ba54 修正：host undo convert失败 2018-11-13 00:25:26 +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
邱剑 86dd2125f1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c2bc969070c2f14a796255c6fcbe01528a8ebf2e':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +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
李泽玺 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
李泽玺 2a220c7f6e Merge pull request #470 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-policy-fail-update to release/2.3.0 
* commit 'c6ae93a2eacd214f29b2d930f621d69cf474d023':
  修正：如果policy blob错误，则无法修改和删除policy
 2018-11-12 20:41:49 +08:00
Qiu Jian c6ae93a2ea 修正：如果policy blob错误，则无法修改和删除policy 2018-11-12 20:39:54 +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
邱剑 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
TangBin 68028cb781 fix region-dns build error 2018-11-12 20:09:01 +08:00
屈轩 44e735b893 适配腾讯云AWS主机操作状态 2018-11-12 20:02:59 +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
邱剑 d6e03f2c0e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6e35123634d4c2edc3556cf8b300ae8252309a30':
  guest适配操作状态
 2018-11-12 19:50:21 +08:00
邱剑 0167b8612d Merge pull request #463 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-guest-action to release/2.2.0 
* commit '1e49526782a6380830b3a311566554db5c91af5f':
  适配Azure实例操作状态
 2018-11-12 19:48:32 +08:00
邱剑 9bd8e7ef3c Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0167b8612de9a27ae0be9aac1f364e851ab268ed':
  适配Azure实例操作状态
 2018-11-12 19:48:32 +08:00
邱剑 e555b116d1 Merge pull request #465 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-classic-storage to release/2.2.0 
* commit '8d4b7a1e64b77d1ac02afa42f870813316e76c1c':
  避免创建云盘时显示经典类型storage
 2018-11-12 19:46:49 +08:00
邱剑 cea85cc780 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'e555b116d1668ceb2d1286f78b746f183046ea61':
  避免创建云盘时显示经典类型storage
 2018-11-12 19:46:49 +08:00
邱剑 671f09d524 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fa1e7d7c4b2a909707db7b331ff110d91ef24e02':
  避免Azure重置密码后主机状态为ready状态
 2018-11-12 19:46:22 +08:00
Zexi Li 0244e70516 support schedule disk 2018-11-12 18:51:34 +08:00
屈轩 50889e374f 避免Azure重置密码后主机状态为ready状态 2018-11-12 18:20:50 +08:00
屈轩 8d4b7a1e64 避免创建云盘时显示经典类型storage 2018-11-12 17:26:59 +08:00
李泽玺 8d885075af Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0b41ec34c91101f3afebe8beb001c93ff0844a8b':
  fix: region 批量创建 data 不正确
 2018-11-12 17:17:24 +08:00
屈轩 1e49526782 适配Azure实例操作状态 2018-11-12 16:51:56 +08:00
屈轩 c0f806241f guest适配操作状态 2018-11-12 16:44:39 +08:00
李泽玺 a2d7178d77 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0b41ec34c91101f3afebe8beb001c93ff0844a8b':
  fix: region 批量创建 data 不正确
 2018-11-12 15:24:50 +08:00
李泽玺 0b41ec34c9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ac6e7ad63d8fbf056730a75727c87205db89c7ea':
  fix: region 批量创建 data 不正确
 2018-11-12 15:24:49 +08:00
Zexi Li 160c48719c fix: region 批量创建 data 不正确 2018-11-12 14:55:34 +08:00
wanyaoqi 3b2d1a281f fix snapshot list provider 2018-11-12 11:28:24 +08:00
唐斌 42636c0b13 Merge pull request #430 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-support-aws to release/2.3.0 
* commit 'c386f26dd267d931f49c5fbdca98696ed0a1af98': (120 commits)
  add GetAttachDiskStatus
  add more log
  security group add id tag
  security group sync
  upload image
  add aws toHOST_TYPES
  add aws scheduler api
  bugfix
  add host type mapping
  bugfix
  bugfix
  bugfix
  support aws china
  add azure metadatas
  add aliyun tag
  bugfix
  add aws tags
  read aws instance type from file
  add todo
  zone bugfix
  ...
 2018-11-10 20:07:29 +08:00
邱剑 e5e8ba0ade Merge pull request #459 in YUNIONIO/onecloud from ~LIZEXI/onecloud:refactor/lzx-region-schedule-guest to release/2.3.0 
* commit 'feccea5cfc5ab7752897ceba67b1509989130c35':
  region: 重构创建server调度代码
 2018-11-10 20:07:20 +08:00
TangBin c386f26dd2 add GetAttachDiskStatus 2018-11-10 20:06:31 +08:00
TangBin 4c3ae8f976 Merge branch 'release/2.3.0' into feature/tb-support-aws 2018-11-10 20:03:07 +08:00
TangBin 74e3f9a699 update vendor 2018-11-10 20:00:36 +08:00
邱剑 9dcfc7215c Merge pull request #458 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-auzre-attach-disk to release/2.2.0 
* commit '22c8899f9c0860effc50091268d53225d39b89b9':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
邱剑 07ddd4651e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '9dcfc7215cea837fc60c7fe32c0c8217c572d205':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
Zexi Li feccea5cfc region: 重构创建server调度代码 2018-11-10 16:44:11 +08:00