opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,335 Commits 30 Branches 712 Tags
9b65a9ecc3929ba60b592fc5070d3f767bb3378c
Commit Graph
4335 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian 9b65a9ecc3 make fmt 2019-02-19 16:53:16 +08:00
Qiu Jian 6bb72482b9 fix: list managed resources and associate resources with uniform filters 2019-02-19 16:45:09 +08:00
Qiu Jian 78dac22cda Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloudprovider 2019-02-18 23:21:56 +08:00
Qiu Jian d32633dc95 Recode cloudprovider/cloudproviderfactory 2019-02-18 23:10:57 +08:00
邱剑 a4ce38c4fe Merge pull request #1013 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-image-p2p-distribution to release/2.6.0 
* commit '4c6f196ec541d1b8c8e2d79ea69c7bd7f9fcf1a6':
  temp commit
  minor updates
  torrent recode
 2019-02-18 23:03:55 +08:00
邱剑 e9e2dbaea1 Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0 
* commit 'f5f2addfd7ea634e598293a37879c251b9eea006':
  避免部署主机失败后未设置external_id而删除主机失败
  rebase 2.6.0
  快照磁盘支持区分公有云私有云
  openstack 同步flavor
  openstack创建
 2019-02-18 23:02:49 +08:00
李泽玺 ed172e15a9 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '4af23de37881eae6c16694358de8da47244f2f1c':
  fix: zone create nil pointer access error
 2019-02-18 18:56:22 +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
李泽玺 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
李泽玺 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
邱剑 23d883ceae Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云
 2019-02-18 18:29:46 +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
屈轩 f5f2addfd7 避免部署主机失败后未设置external_id而删除主机失败 2019-02-18 17:49:06 +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
张东亮 44e1992570 Merge pull request #1074 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.6.0-20190218 to release/2.6.0 
* commit '8e65f740cfb2df43f2909604ca7166c0157ac6e5':
  fix: build error because of notify and actionlog interface change
 2019-02-18 15:28:31 +08:00
Qiu Jian 8e65f740cf fix: build error because of notify and actionlog interface change 2019-02-18 15:25:53 +08:00
张东亮 c5e70a00ec Merge pull request #1073 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.6.0-20190218 to release/2.6.0 
* commit '38b914c6fac78298ccab230db34bce87b9b01cc0':
  update vendor
 2019-02-18 14:23:57 +08:00
Qiu Jian 38b914c6fa Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190218 
Conflicts:
	Gopkg.lock
 2019-02-18 13:31:54 +08:00
邱剑 af504a44ab Merge pull request #1030 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feauture/wyq/climc-auto-complete to release/2.6.0 
* commit '34242bb0fffa773077530beea4a00c119695c9bf':
  fix code
  add option auto complete
 2019-02-18 12:30:49 +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
张东亮 cdb12a1354 Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0 
* commit '9f35039209c5a9251d05ad720012531a50f8cc8b':
  add service tag for actionlog
  make fmt
  fix: logger did not record start time of events
 2019-02-18 12:25:16 +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
邱剑 6e09802b5f Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '0851d28381043d838554578ea4f48753ff2b460b':
  解决冲突
 2019-02-18 10:46:22 +08:00
邱剑 d40e828759 Merge pull request #1068 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit '0b5ba8a42f41d3f9d6ed2be06938d3de160c1e5d':
  fix set storage name
 2019-02-18 10:45:52 +08:00
邱剑 4ea4766930 Merge pull request #1048 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-stage-2.2-fix to release/2.6.0 
* commit 'fa49e138f26fbeb21a193ef48befb98dcbe37f99':
  update vendor & bugfix
  bugfix
  替换不必要的重复func
  remove useless todo
  rebuild root bugfix
  server get disks fix
  server delete etc fix
  server delete etc fix
 2019-02-18 10:44:43 +08:00
屈轩 378ba9bf04 解决冲突 2019-02-18 10:23:12 +08:00
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +08:00
Qiu Jian 0ba78e2cd7 update vendor 2019-02-18 00:44:43 +08:00
邱剑 94ea861a3d Merge pull request #1066 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-ssh-raw-run to release/2.6.0 
* commit 'fb5e60c8fe873283c458b62592ba8e0f3530a1d4':
  util/ssh: add RawRun to get cmd output directly.
 2019-02-16 22:22:14 +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
邱剑 4fa0f7216d Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'f8669e5844024e23a665c207be18806d5d6e639d':
  修改超售比后立即刷新调度缓存
 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
TangBin fa49e138f2 update vendor & bugfix 2019-02-16 17:55:42 +08:00
屈轩 b388874335 rebase 2.6.0 2019-02-16 17:44:40 +08:00
屈轩 f2c16bbc48 快照磁盘支持区分公有云私有云 2019-02-16 17:39:42 +08:00
屈轩 27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩 d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
屈轩 423ef544e2 修改超售比后立即刷新调度缓存 2019-02-16 17:31:05 +08:00
wanyaoqi 0b5ba8a42f fix set storage name 2019-02-16 17:25:08 +08:00
李泽玺 a2a28c05a5 Merge pull request #1065 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-host-add-admin-public-key to release/2.6.0 
* commit '88b11a373b0206a12ec0028e5e3bd11ca7d16281':
  host: deploy admin ssh public key when register
 2019-02-16 17:16:48 +08:00
Zexi Li fb5e60c8fe util/ssh: add RawRun to get cmd output directly. 2019-02-16 17:01:02 +08:00
TangBin 4669903d8a Merge branch 'release/2.6.0' into bugfix/tb-huawei-stage-2.2-fix 2019-02-16 16:00:48 +08:00
TangBin a0f3423519 bugfix 2019-02-16 15:59:47 +08:00
Qiu Jian 8554d13c4a make fmt 2019-02-16 15:17:31 +08:00