opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,875 Commits 27 Branches 687 Tags
a97e2faea83578ae8495ab2e4a3bb22bbfcfde4c
Commit Graph
47 Commits
Author SHA1 Message Date
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
Qiu Jian cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
Qiu Jian cce3d04fc1 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190305 
Conflicts:
	pkg/util/qemuimg/qemuimg.go
 2019-03-05 12:28:06 +08:00
Qiu Jian 1cfd7e26f2 fix: isActive error message include filename 2019-03-05 10:20:23 +08:00
Qiu Jian e289549e5d fix: not set converting status 2019-03-05 09:48:36 +08:00
Qiu Jian 068ad7b141 fix: glance image convert consume too much IO, use ionice -c idle to 
reduce its IO impact
 2019-03-05 02:29:27 +08:00
Qiu Jian 605cbb2558 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-04 01:42:39 +08:00
Qiu Jian 329e394c45 Remove virtualSize column from images_tbl 2019-02-25 17:06:44 +08:00
Qiu Jian 92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
邱剑 0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +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
Qiu Jian 8e65f740cf fix: build error because of notify and actionlog interface change 2019-02-18 15:25:53 +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
Qiu Jian b70de93aa8 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190214 
Conflicts:
	Gopkg.lock
 2019-02-13 21:49:51 +08:00
Qiu Jian 9bd15451ae fix image misc bugs 2019-02-13 00:10:03 +08:00
邱剑 c7da5787cf Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6970baa2a08950319069a44d75df4c4272bac775':
  1. network-list add is_private/is_public filter 2. set default image quota to 10
 2019-01-30 21:11:11 +08:00
Qiu Jian 0e3f2e160c temp commit 2019-01-30 21:06:48 +08:00
Qiu Jian ddde11f4f9 1. network-list add is_private/is_public filter 
2. set default image quota to 10
 2019-01-30 20:50:22 +08:00
wanyaoqi 60fe104da2 snapshot recycle, disk recycle, dhcp relay use raw socket 2019-01-25 20:32:44 +08:00
邱剑 cb2cc33866 Merge pull request #887 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-import-task-shoud-run-in-localtaskworker to release/2.5.0 
* commit 'ab2ee8d16d5a63a13aff861c8710043acb46cbc1':
  minor fixes
  修正：image import过程为耗时操作，需要在LocalTaskRun里执行，避免占用image的操作锁
 2019-01-07 21:48:02 +08:00
Qiu Jian ab2ee8d16d minor fixes 2019-01-05 19:37:00 +08:00
屈轩 de2f6c219f 避免删除非正常状态下image再次恢复时,镜像使用时会出现非预期状态 2019-01-05 18:26:16 +08:00
Qiu Jian aa776b308b 修正：image 
import过程为耗时操作，需要在LocalTaskRun里执行，避免占用image的操作锁
 2019-01-05 10:21:59 +08:00
邱剑 e768975132 Merge pull request #878 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-image-require-override-pending-delete to release/2.5.0 
* commit '682d286aa133ec39f5b1284c0719fc9334483e7d':
  伪删除镜像的清理需要增加override-pending-delete的参数
 2019-01-04 13:17:44 +08:00
邱剑 9b74919020 Merge pull request #881 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-copy-from-signature-fail to release/2.5.0 
* commit 'dfc1e4fb9e9dd54e20d9bf490946fb4dc22bf196':
  update glance rpm requies
  minor fixes
  修正: image-import从阿里云导入镜像失败，原因是多设置了content-type的header
 2019-01-04 00:17:08 +08:00
Qiu Jian 71f47e7d32 minor fixes 2019-01-03 23:33:05 +08:00
Qiu Jian 791c9bd49d 修正: 
image-import从阿里云导入镜像失败，原因是多设置了content-type的header
 2019-01-03 22:58:24 +08:00
Qiu Jian 682d286aa1 伪删除镜像的清理需要增加override-pending-delete的参数 2019-01-03 20:10:49 +08:00
Qiu Jian 3d33012291 images-list增加checksum字段 2019-01-03 20:03:47 +08:00
邱剑 1a44405e1b Merge pull request #865 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-esxiagent-support to release/2.5.0 
* commit '1061b47afd0a060091a5fbd5526b295d05db4e60':
  修正：镜像通过PUT接口上传后，需要启动image convert tasks
  支持esxi agent，创建主机缺省用vmdk格式的镜像
 2019-01-02 21:05:58 +08:00
Qiu Jian 1061b47afd 修正：镜像通过PUT接口上传后，需要启动image convert tasks 2019-01-02 17:13:47 +08:00
Qiu Jian be80187eb3 glance的usage指标增加所有镜像(image + iso)的统计 2018-12-29 22:02:30 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
Qiu Jian 1e4789285d minor improvements 2018-12-28 20:24:23 +08:00
Qiu Jian a3e802d803 recode quota and usage for image service 2018-12-27 23:59:31 +08:00
Qiu Jian cbcd9f5dc1 make image protected show in list 2018-12-27 18:48:47 +08:00
Qiu Jian 330dade325 1. 增加EnableTorrentService选项 2. 增加PerformMarkPublicProtected接口 2018-12-27 18:24:04 +08:00
Qiu Jian df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
Qiu Jian dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian 21558d3dd2 final commit 
Conflicts:
	pkg/cloudcommon/policy/policy.go
	pkg/util/azure/storagecache.go
 2018-12-26 23:02:19 +08:00
Qiu Jian 102a8d2d12 temp commit 2018-12-26 22:59:59 +08:00
Qiu Jian 7d8cb846f9 move version, qemutil, qemuimg from cloudcommon to util 2018-12-26 22:59:59 +08:00
Qiu Jian b2f4c667eb fix bugs 2018-12-26 22:59:59 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian f9d9617220 update fmt & doc 2018-12-26 22:52:25 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00