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
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
邱剑 c4b981f13f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'a4ce38c4fe881d98f0c5f3cfac295da01fa301ba':
  temp commit
  minor updates
  torrent recode
 2019-02-18 23:03:56 +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
邱剑 476f61f32b Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'e9e2dbaea189e10f44f2b5fd61b11cac09da45f4':
  避免部署主机失败后未设置external_id而删除主机失败
  rebase 2.6.0
  快照磁盘支持区分公有云私有云
  openstack 同步flavor
  openstack创建
 2019-02-18 23:02:50 +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
wanyaoqi ee69f890bd bug fix 2019-02-18 21:09:09 +08:00
李泽玺 a77a56cf1a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ed172e15a9a40792eea7076a41da22c1c148105b':
  fix: zone create nil pointer access error
 2019-02-18 18:56:22 +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
李泽玺 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
邱剑 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
邱剑 221a5712b4 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '23d883ceaebb96bbb9a2a90c827cc447d44dfece':
  通过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
TangBin 119516736c add qcloud driver lb sync method && add comment 2019-02-18 17:46:24 +08:00
屈轩 2ffe44a383 通过provider is_public_cloud区分公有云私有云 2019-02-18 17:43:31 +08:00
TangBin 11f5b40b63 bugfix & comment fix 2019-02-18 17:14:14 +08:00
Qiu Jian c283b5864e fix: zone create nil pointer access error 2019-02-18 16:13:32 +08:00
张东亮 fd1ef62d6a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '44e1992570f197b989a642b712b10c968dd4e66c':
  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
张东亮 d26719ecfe Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'cdb12a1354d858ff4410346b5027e8a1aba47c0e':
  add service tag for actionlog
  make fmt
  fix: logger did not record start time of events
 2019-02-18 12:25:17 +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
邱剑 17f53c1804 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6e09802b5f502aa052387995b64b9b3c7c8d9107':
  解决冲突
 2019-02-18 10:46:23 +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
邱剑 b0be427b28 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'd40e828759ba014a28e576bb46b77536ed4e90b2':
  fix set storage name
 2019-02-18 10:45:53 +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
邱剑 527e9ee57c Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4ea4766930ef8bd99b799ac6d763672b78c40e90':
  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:44 +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
邱剑 83e275cde3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '94ea861a3de83e1d4fd86efb8beff75de82e0edd':
  util/ssh: add RawRun to get cmd output directly.
 2019-02-16 22:22:15 +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
邱剑 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
邱剑 98eb908c85 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4fa0f7216d03bcd9736ee686e0356ee1577ab178':
  修改超售比后立即刷新调度缓存
 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
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
李泽玺 f0db2a8a36 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'a2a28c05a5810ebe90c44abb902d6166455d8a70':
  host: deploy admin ssh public key when register
 2019-02-16 17:16:49 +08:00
Zexi Li fb5e60c8fe util/ssh: add RawRun to get cmd output directly. 2019-02-16 17:01:02 +08:00