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
3773 Commits
This Branch
This Branch
All Branches
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
邱剑 2d53d2c569 Merge pull request #1114 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflicate-2.4.0 to release/2.4.0 
* commit '9c36d6945a8e8adf0cd07a5757aa1b6928694e92':
  去除调试信息
  避免过滤cloudprovider失效
 2019-02-25 12:27:47 +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
邱剑 554f7fa0a0 Merge pull request #1112 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-image-cache to release/2.2.0 
* commit '4c01b7ad2abef04cdc55c3ef0f1592e938befcbe':
  去除调试信息
  避免过滤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
邱剑 20e28d72e6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '55697e0aeae04d78c2e9fe978736cbb0e9ec32e8':
  Add drone pipeline config
 2019-02-22 09:57:42 +08:00
邱剑 55697e0aea Merge pull request #1100 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-drone to release/2.4.0 
* commit 'c4ffcd08b51054992a9dd1a35f646f12606cf161':
  Add drone pipeline config
 2019-02-22 09:57:41 +08:00
Zexi Li c4ffcd08b5 Add drone pipeline config 2019-02-22 09:55:05 +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
邱剑 503729880a Merge pull request #1097 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-skip-empty-duplicate-service to release/2.4.0 
* commit 'c624341b19f20918a3c0ba7ec2c4aad2b18bb506':
  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
邱剑 6c6f80488f Merge pull request #1095 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-webconsole to release/2.5.0 
* commit 'f4cf4ab93d7b68918502cb7bfa1b0733ac20f3a1':
  识别openstack protocol
 2019-02-21 15:27:08 +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
李泽玺 9e24e124f4 Merge pull request #1090 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-auth-fail-may-invalid-admintoken to release/2.4.0 
* commit '588976672f21f06026df5596461849f6a968d6a2':
  fix: temporay auth failure may invalidate valid admintoken
 2019-02-21 12:10:29 +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
邱剑 6ec91d6f4d Merge pull request #1080 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-esxi-vmdk-parse to release/2.4.0 
* commit '323836b1f813cdee1a7f0f179aed78925775396d':
  识别新版vmdk
 2019-02-19 17:34:29 +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
李泽玺 adcef3a561 Merge pull request #1075 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-create-nil-pointer-error to release/2.0.0 
* commit 'c283b5864e301da968c6cf9f5a0e429c8869cd72':
  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
张东亮 63ec32da7b Merge pull request #1070 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-update-vendor-2.5.0-20190218 to release/2.5.0 
* commit '0ba78e2cd731ef6459730682079b5b8b1360fffd':
  update vendor
 2019-02-18 12:25:37 +08:00
邱剑 569e3d0094 Merge pull request #1071 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-conflict-fix to release/2.4.0 
* commit '378ba9bf04f885525094e57380c711960dadc4a3':
  解决冲突
 2019-02-18 10:46:22 +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
Qiu Jian 0ba78e2cd7 update vendor 2019-02-18 00:44:43 +08:00
邱剑 869a015cc8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4c6177bffac961d684f970e85bfbcc68f4ec022f':
  修改超售比后立即刷新调度缓存
 2019-02-16 22:21:28 +08:00
邱剑 f8669e5844 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '869a015cc83f7555342f933812b7ef5b32fc7f41':
  修改超售比后立即刷新调度缓存
 2019-02-16 22:21:28 +08:00
邱剑 4c6177bffa Merge pull request #1069 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-refresh-scheduler-cache to release/2.3.0 
* commit '423ef544e27caab508dfb9d309e8b6afdcdb0f0e':
  修改超售比后立即刷新调度缓存
 2019-02-16 22:21:27 +08:00
屈轩 423ef544e2 修改超售比后立即刷新调度缓存 2019-02-16 17:31:05 +08:00
邱剑 5f2bb7cd91 Merge pull request #1060 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-convert-respect-keystone-protocol to release/2.5.0 
* commit 'a7faa9b318f8bb6c36ce70ddadc20d9a472728b3':
  minor changes
  fix: converted host configuration always use http as keystone protocol
 2019-02-16 12:29:38 +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
邱剑 3731a28a3a Merge pull request #1056 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-huawei-openstack-sysdisk-interface to release/2.5.0 
* commit 'dbf24af4057d4f7415569191ceef84c35ba9fc1e':
  implement sysdisk interface for openstack and huawei driver
 2019-02-15 18:53:38 +08:00