Commit Graph
373 Commits
Author SHA1 Message Date
邱剑 ce24455d1b Automatic merge from release/2.2.0 -> release/2.3.0
* commit '5fb53912d86d4159ccc963899dd3b6eee54127d7':
  Azure挂载卸载磁盘更改lun有可能会失败
2018-11-13 12:00:40 +08:00
屈轩 472dbfdfef Azure挂载卸载磁盘更改lun有可能会失败 2018-11-13 11:52:37 +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
TangBin 68028cb781 fix region-dns build error 2018-11-12 20:09:01 +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
屈轩 8d4b7a1e64 避免创建云盘时显示经典类型storage 2018-11-12 17:26:59 +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
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
2018-11-10 15:30:31 +08:00
屈轩 84559581d4 避免调度到Azure经典类型主机上 2018-11-10 15:28:22 +08:00
李泽玺 bd548462a4 Merge pull request #452 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-extender to release/2.3.0
* commit '95f49ead841ef7918c5d7d7a96f05806dc13902f':
  scheduler: k8s scheduler extender
2018-11-10 14:32:43 +08:00
TangBin 4b9c26aee2 add more log 2018-11-10 14:00:22 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
2018-11-10 13:35:05 +08:00
Zexi Li 95f49ead84 scheduler: k8s scheduler extender 2018-11-10 13:27:00 +08:00
邱剑 fb6d1082af Automatic merge from release/2.2.0 -> release/2.3.0
* commit '182db4cd4e16a384be25ad05ffbe63df2a7f3efa':
  跟随主机创建的磁盘,跟随主机删除
  fix: reverseproxy out of fds
2018-11-09 20:40:20 +08:00
屈轩 d73fd87227 跟随主机创建的磁盘,跟随主机删除 2018-11-09 20:30:56 +08:00
Yousong Zhou 9388748e45 pkg: httputils: ParseJSONResponse(): rewrite for clearness
Make it more clear that it's possible the function can return with
body==nil and err==nil
2018-11-08 15:36:24 +00:00
TangBin d71357f906 security group add id tag 2018-11-08 20:21:15 +08:00
TangBin 467630e0b3 security group sync 2018-11-08 19:18:01 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
TangBin c55f802148 upload image 2018-11-08 15:34:01 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +08:00
Qiu Jian 388b793490 修正:增加owner级别权限,放置普通用户可以访问系统资源 2018-11-08 01:36:19 +08:00
TangBin c7ff5c6f87 bugfix 2018-11-07 17:50:00 +08:00
TangBin 1f341232de update vendor and fix conficlt 2018-11-07 17:47:00 +08:00
邱剑 ad60672977 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '7fb6e0e15ed2d103b81f92ad37243032490a5553':
  修复同步阿里云资源时出现重复资源问题
2018-11-03 19:58:11 +08:00
邱剑 b399237169 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'ad60672977714ed96738f91aef365e96d971050a':
  修复同步阿里云资源时出现重复资源问题
2018-11-03 19:58:11 +08:00
屈轩 09d9990640 修复同步阿里云资源时出现重复资源问题 2018-11-03 18:33:34 +08:00
TangBin 29f83c74f4 bugfix 2018-11-03 18:21:13 +08:00
TangBin d5c1c7f710 bugfix 2018-11-03 17:46:29 +08:00
TangBin 7649ccb10d bugfix 2018-11-03 17:36:28 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
TangBin bab62348fc support aws china 2018-11-03 17:31:46 +08:00
Qiu Jian 7e463a4644 hack: scheduler ping/version escape auth 2018-11-03 10:21:19 +08:00
TangBin 69c14a20b1 add azure metadatas 2018-11-02 15:50:57 +08:00
TangBin 79ba3e44c8 add aliyun tag 2018-11-02 15:28:19 +08:00
TangBin 94dfab5663 bugfix 2018-11-02 11:36:16 +08:00
TangBin 914a8889bd add aws tags 2018-11-01 20:07:30 +08:00
TangBin bbcaf0084c read aws instance type from file 2018-11-01 15:41:32 +08:00
TangBin 350caaeac8 add todo 2018-10-31 19:06:48 +08:00
TangBin 96ef49c478 zone bugfix 2018-10-31 18:18:20 +08:00
TangBin 2971c91908 eip bugif 2018-10-31 18:06:45 +08:00
TangBin 64a0960697 eip bugfix 2018-10-31 17:58:15 +08:00
TangBin e9bec7e151 bugfix 2018-10-31 17:10:19 +08:00
TangBin 0b09372ffa bugfix 2018-10-31 17:07:53 +08:00
TangBin dbd0c1b9e0 add todo 2018-10-31 14:33:31 +08:00
TangBin c14e79f465 bugfix 2018-10-30 19:16:13 +08:00
TangBin d4fcbde56d bugfix 2018-10-30 17:13:57 +08:00
TangBin 754a8eb488 bnugfix 2018-10-30 17:04:42 +08:00
TangBin d9542b9048 add rebuild root 2018-10-30 16:49:56 +08:00