opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-22 06:40:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,773 Commits 27 Branches 687 Tags
ecc653f0a1de013d34da660e9494f51649fda0cc
Commit Graph
2506 Commits
Author SHA1 Message Date
TangBin ecc653f0a1 parameter create fix 2019-02-26 18:29:32 +08:00
邱剑 fb6d410b2a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2d53d2c569dedbe0d09773b5aca46305331fd68f':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:48 +08:00
屈轩 9c36d6945a 冲突解决 2019-02-25 12:06:38 +08:00
邱剑 a7db0fe024 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '554f7fa0a07329180a878f3bf9d1fe9e04bd1203':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 11:56:01 +08:00
屈轩 4c01b7ad2a 去除调试信息 2019-02-25 11:51:21 +08:00
屈轩 7420fddad5 避免过滤cloudprovider失效 2019-02-25 11:37:16 +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
屈轩 f4cf4ab93d 识别openstack protocol 2019-02-21 15:25:01 +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
李泽玺 695ed4cbd3 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9e24e124f49123376490a091665e33c229a74db1':
  fix: temporay auth failure may invalidate valid admintoken
 2019-02-21 12:10:29 +08:00
Qiu Jian 588976672f fix: temporay auth failure may invalidate valid admintoken 2019-02-21 12:08:19 +08:00
Qiu Jian 72d8dd8961 fix: esxi references2Objects refer nil objects 2019-02-20 23:13:27 +08:00
邱剑 fb4592a4fa Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6ec91d6f4dd6ebf539369987fd829738bb6c0cbf':
  识别新版vmdk
 2019-02-19 17:34:30 +08:00
屈轩 323836b1f8 识别新版vmdk 2019-02-19 17:25:55 +08:00
李泽玺 b3298751e5 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fd7f91f5c6f06f0714b88665098effa96ca83e60':
  fix: zone create nil pointer access error
 2019-02-18 18:56:21 +08:00
李泽玺 4af23de378 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'bac6404b4aec30c206ac68c1f8defc2b220ebc24':
  fix: zone create nil pointer access error
 2019-02-18 18:56:21 +08:00
李泽玺 bac6404b4a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b3298751e5f1954b527c7d76112c867b977860d8':
  fix: zone create nil pointer access error
 2019-02-18 18:56:21 +08:00
李泽玺 fd7f91f5c6 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c326650e7ada90922639f8368fbc06b5922a3ad2':
  fix: zone create nil pointer access error
 2019-02-18 18:56:20 +08:00
李泽玺 c326650e7a Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'adcef3a561c3c8b4a5daffc0b120b8c89292b108':
  fix: zone create nil pointer access error
 2019-02-18 18:56:20 +08:00
邱剑 274e31d858 Merge pull request #1076 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-public-private-cloud to release/2.5.0 
* commit '2ffe44a38355f7201efd30abc4f4700b9a8e42cb':
  通过provider is_public_cloud区分公有云私有云
 2019-02-18 18:29:45 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
Qiu Jian c283b5864e fix: zone create nil pointer access error 2019-02-18 16:13:32 +08:00
邱剑 0851d28381 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '569e3d00946e58f03d0b386795ea1e612c0fc04a':
  解决冲突
 2019-02-18 10:46:22 +08:00
屈轩 378ba9bf04 解决冲突 2019-02-18 10:23:12 +08:00
邱剑 f8669e5844 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '869a015cc83f7555342f933812b7ef5b32fc7f41':
  修改超售比后立即刷新调度缓存
 2019-02-16 22:21:28 +08:00
邱剑 869a015cc8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4c6177bffac961d684f970e85bfbcc68f4ec022f':
  修改超售比后立即刷新调度缓存
 2019-02-16 22:21:28 +08:00
屈轩 423ef544e2 修改超售比后立即刷新调度缓存 2019-02-16 17:31:05 +08:00
Qiu Jian a7faa9b318 minor changes 2019-02-16 01:25:16 +08:00
Qiu Jian 6de65ba419 fix: converted host configuration always use http as keystone protocol 2019-02-15 23:05:30 +08:00
邱剑 713fa7d7bb Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'c44a7f8407cca4db2a97caa93908966a1565d7f4':
  全量同步后立即更新cloudaccount状态
 2019-02-15 19:58:38 +08:00
邱剑 c44a7f8407 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6528992b5be15b5cfba35dce770c272f98d4c452':
  全量同步后立即更新cloudaccount状态
 2019-02-15 19:58:37 +08:00
邱剑 6528992b5b Merge pull request #1050 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-sync-status to release/2.3.0 
* commit '4fa4083e8dc0b55926e1c430bf853f983a116ad8':
  全量同步后立即更新cloudaccount状态
 2019-02-15 19:58:37 +08:00
屈轩 4fa4083e8d 全量同步后立即更新cloudaccount状态 2019-02-15 16:03:24 +08:00
Qiu Jian dbf24af405 implement sysdisk interface for openstack and huawei driver 2019-02-15 13:29:50 +08:00
邱剑 a747ad2c20 Merge pull request #1049 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-login to release/2.5.0 
* commit 'c9756aa6f0da02ac8e211dbf7bb88606cadb1aa3':
  添加参数，允许不直接登录虚拟机
 2019-02-15 12:12:19 +08:00
邱剑 256b6e9841 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '220df08a486d2a5e725c64e3f7cc42437c7ca41f':
  log日志记录external_id
 2019-02-15 12:11:56 +08:00
邱剑 220df08a48 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ab97a01b9ccaaa1b2af46fd9bc744e256ccea69e':
  log日志记录external_id
 2019-02-15 12:11:55 +08:00
邱剑 c871a31882 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'a5731134dc8e8b62afbd1f7504f148291ab039ef':
  update: customize system disk size and backend for each hypervisor
 2019-02-15 12:09:44 +08:00
屈轩 2d7a17464c log日志记录external_id 2019-02-15 11:56:12 +08:00
屈轩 c9756aa6f0 添加参数，允许不直接登录虚拟机 2019-02-15 10:46:57 +08:00
Qiu Jian 543c87fb84 cloudcommon using structarg.ParseArgs2 to parse arguments 2019-02-14 17:31:27 +08:00
Qiu Jian 5ceaaf716e update: customize system disk size and backend for each hypervisor 2019-02-13 23:39:36 +08:00
邱剑 b9b57e8441 Merge pull request #1033 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-bugfix-20190213 to release/2.5.0 
* commit 'dd317fb83d6540ba565558acbffdadd1d5ea63ec':
  update vendor
  fix image misc bugs
 2019-02-13 21:44:51 +08:00
Qiu Jian 4bca4b1e6e implement baremetal host driver 2019-02-13 18:23:57 +08:00
Qiu Jian d45003f87d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 16:10:14 +08:00
Zexi Li e8d8097627 修正: disk 传入 scheduler 参数不对, size_mb 应该为 size 2019-02-13 15:49:29 +08:00
Qiu Jian 8b71e18f2b Merge branch 'hotfix/qj-host-convert-sched-failed' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 15:38:50 +08:00
Qiu Jian b11f117781 minor updates 2019-02-13 15:38:30 +08:00