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
邱剑 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
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
邱剑 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
邱剑 d6e03f2c0e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6e35123634d4c2edc3556cf8b300ae8252309a30':
  guest适配操作状态
 2018-11-12 19:50:21 +08:00
邱剑 8ccb81322f Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '9bd8e7ef3c0b198bd7a6ba6d20cbdcf0c40d6d42':
  适配Azure实例操作状态
 2018-11-12 19:48:32 +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
邱剑 655f995c60 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'cea85cc7805389dc8ccbf593790cc020693101c2':
  避免创建云盘时显示经典类型storage
 2018-11-12 19:46:49 +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
邱剑 9eeaca87d3 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '671f09d524687b7690e71598fe58563d646c36f4':
  避免Azure重置密码后主机状态为ready状态
 2018-11-12 19:46:22 +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
TangBin c8f2510fcb snapshot fix 2018-11-12 18:11:24 +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
TangBin 6ec78519cb detach disk add more log 2018-11-12 17:09:44 +08:00
屈轩 1e49526782 适配Azure实例操作状态 2018-11-12 16:51:56 +08:00
屈轩 c0f806241f guest适配操作状态 2018-11-12 16:44:39 +08:00
TangBin 5631f5ed68 disk create fix 2018-11-12 16:05:31 +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
李泽玺 71a5da54d8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a2d7178d773381ec42967b73dafb247034a59177':
  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
李泽玺 5d077bb94a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '646497c139433b37b0c1725db3c15236f6523270':
  fix snapshot list provider
 2018-11-12 11:31:01 +08:00
wanyaoqi 3b2d1a281f fix snapshot list provider 2018-11-12 11:28:24 +08:00
唐斌 447628410e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '42636c0b13bc9e2a77c0db40e9aeba8ae5f017bf': (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:30 +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
邱剑 5bdab3cb38 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e5e8ba0ade8a4b25d2e125eee5a3cb0e2566199d':
  region: 重构创建server调度代码
 2018-11-10 20:07:20 +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
邱剑 2b0bab24f9 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '07ddd4651e5affc8a018e69b8d4970211ea2cd82':
  添加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
屈轩 22c8899f9c 添加Azure挂载磁盘时允许的虚机状态 2018-11-10 15:32:18 +08:00
邱剑 b3f5172732 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0b384660a403f08e5cf42887bec4c4870a59d201':
  增加climc policy-admin-capable命令
 2018-11-10 15:30:57 +08:00
邱剑 0b384660a4 Merge pull request #447 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-admin-capable-test to release/2.3.0 
* commit 'dbab380d734d0de1684f5cb4472869d5d981d773':
  增加climc policy-admin-capable命令
 2018-11-10 15:30:57 +08:00
邱剑 7d249bb3d1 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '9c91085004c951b0efecd90c974a6024ee65a540':
  避免调度到Azure经典类型主机上
 2018-11-10 15:30:31 +08:00
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
 2018-11-10 15:30:31 +08:00
邱剑 5235a8d1e0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '13d38e80296ded7aea28d7d1a2378c7f6805ccec':
  挂载磁盘失败时自动解除与虚机的关系
 2018-11-10 15:29:29 +08:00