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
4,361 Commits 30 Branches 714 Tags
cb1cf77c4ee4100fc1a4f330c203011e1b35c821
Commit Graph
902 Commits
Author SHA1 Message Date
TangBin 9ff96c7cf1 fix huawei image upload 2019-02-19 20:06:23 +08:00
邱剑 09fbf49b2b Merge pull request #1081 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-huawei-native-image-not-found to release/2.6.0 
* commit '766ad18d1a7704fddcd259ca6bea11181ac04975':
  fix: fail to create huawei server with native image
 2019-02-19 19:06:49 +08:00
Qiu Jian 766ad18d1a fix: fail to create huawei server with native image 2019-02-19 18:07:15 +08:00
邱剑 0b39fc47a8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'fb4592a4fa9005503f87caacc7bcfd88fd8e5430':
  识别新版vmdk
 2019-02-19 17:34:30 +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
TangBin 8fdc9ec93d merge release/2.6.0 2019-02-19 09:26: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
邱剑 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
邱剑 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
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 8e65f740cf fix: build error because of notify and actionlog interface change 2019-02-18 15:25:53 +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
邱剑 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
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +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
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
Qiu Jian 066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +08:00
Qiu Jian 4c6f196ec5 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution 
Conflicts:
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/policy/defaults.go
	pkg/util/sysutils/sysutils.go
 2019-02-15 22:46:01 +08:00
李泽玺 cf3631983c Merge pull request #1058 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit 'c886b09982d97c24709f384ead1b69a20f38fae0':
  fix remotefix close body bug
  move ethernet from cloudcommon to utils
  rootfs drivers: linux, macOS, Android, ESXi etc.
 2019-02-15 21:19:51 +08:00
wanyaoqi 853d9dbb5e move ethernet from cloudcommon to utils 2019-02-15 20:29:30 +08:00
wanyaoqi 27abd40bd7 rootfs drivers: linux, macOS, Android, ESXi etc. 2019-02-15 20:16:23 +08:00
Qiu Jian f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215 
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
 2019-02-15 19:47:56 +08:00
邱剑 38d22259a7 Merge pull request #1053 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-huawei-recode to release/2.6.0 
* commit '44b409a4cd9e70fa44cae86ceff659b4344994d4':
  minor update
  minor fixes
  recode huawei client
 2019-02-15 18:54:05 +08:00
Qiu Jian 44b409a4cd minor update 2019-02-15 14:20:47 +08:00
Qiu Jian 186b32e3cf minor fixes 2019-02-15 09:47:58 +08:00
Qiu Jian 359c451e8e recode huawei client 2019-02-15 02:26:57 +08:00
万垚奇 abfe3f4c3c Merge pull request #1047 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit '3eb7c2900ec29e5b8fa2d1f1def6d469ce003de0':
  fix code
  fs driver fix
 2019-02-14 20:31:00 +08:00
wanyaoqi 3eb7c2900e fix code 2019-02-14 20:29:24 +08:00
邱剑 89c09291fd Merge pull request #1046 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-cloud-region-cities to release/2.6.0 
* commit '8656db336b578b55840028e97e20421010cca423':
  minor fixes
  add cloud-region-providers climc command
  feature: get list of cities where cloud region resides and filter cloud regions by city
 2019-02-14 17:04:27 +08:00
TangBin 37c79c9a23 替换不必要的重复func 2019-02-14 14:43:59 +08:00
TangBin b12f0252eb remove useless todo 2019-02-14 12:31:43 +08:00
TangBin d927f2dfc4 rebuild root bugfix 2019-02-14 12:28:36 +08:00
wanyaoqi b210add54d fs driver fix 2019-02-14 10:23:10 +08:00
Qiu Jian e1b7854993 feature: get list of cities where cloud region resides and filter cloud 
regions by city
 2019-02-14 01:40:26 +08:00
TangBin 5fbc28f8aa server get disks fix 2019-02-13 18:07:18 +08:00
TangBin 632d1118db server delete etc fix 2019-02-13 17:04:06 +08:00
TangBin 7a447d31db server delete etc fix 2019-02-13 12:14:16 +08:00
Qiu Jian 0ad4c22879 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213 
Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:12:19 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:01:01 +08:00
tangbin 2d4166e841 backend group sync bugfix 2019-02-12 23:32:38 +08:00