opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,258 Commits 27 Branches 687 Tags
73eff7328953b867fcdc2cbb97dc6e5e3dc75641
Commit Graph
106 Commits
Author SHA1 Message Date
Qiu Jian 73eff73289 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-2.3.0 
Conflicts:
	pkg/httperrors/httperrors.go
 2018-10-22 12:29:07 +08:00
Qiu Jian 4d1d4e56fd 修正：worker timeout之后需要从worker 
manager中移除，不再占用worker的数量限额，否则timeout之后，并不能解决整个服务被卡住的问题
 2018-10-22 01:38:52 +08:00
邱剑 442040d030 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '084d2f1cdd7b2b3b674ed168a31f015088d105be':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +08:00
邱剑 084d2f1cdd Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +08:00
邱剑 f0e712e8d1 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'a5dfd52413ab09c3842320a210badfeee56d703b':
  修复parallel task未初始化subtask
 2018-10-17 16:58:53 +08:00
屈轩 42176ea948 修复parallel task未初始化subtask 2018-10-17 16:12:35 +08:00
邱剑 219015d50c Merge pull request #287 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keypair-improvment to release/2.3.0 
* commit 'cfa4f5db945dcef09137c712370edcb3d8e33593':
  server show expired_at column
  修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2. 修正公有云注入userdata的问题
  Update vendor
  Update format
  Force format before build
  minor updates
  Update vendor
  改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 其他
 2018-10-15 18:20:30 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
Zexi Li 84ee48335b fix: region task notify not work 2018-10-11 19:04:11 +08:00
邱剑 9c8ad6fc82 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '53e1f07f18062d249a88da0fa274c3af11daa21e':
  允许list description
 2018-10-11 12:02:18 +08:00
屈轩 d25f48f1de 允许list description 2018-10-10 20:01:21 +08:00
TangBin c0437db69c fix created_at & add license 2018-09-25 12:20:18 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
TangBin 65880ff857 mcclient error 2018-09-18 14:50:45 +08:00
邱剑 e1627fdd8a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '06af20eb4b9ee058ccb6937409cfcbce166bd5d5':
  cloudcommon: virtualresource: allow setting is_system on creation
  cloudcommon: db: more readable log on sql error
 2018-09-18 12:31:01 +08:00
Yousong Zhou 9efad3e417 cloudcommon: virtualresource: allow setting is_system on creation 
We have validation against the field yet the rule tag metadata does not
actually allow it
 2018-09-18 04:04:04 +00:00
Yousong Zhou 284ebcfaab cloudcommon: db: more readable log on sql error 2018-09-18 03:53:22 +00:00
邱剑 34420c83ab Merge pull request #197 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit 'c02425506d02960a60d849be53d9904b4062d20b':
  fix convert
  if disk resized, update disk size to snapshot size did not auto snapshot when guest not in status ready or running add snapshot-show
  disk reset minor fixs
  fix code
 2018-09-17 12:16:15 +08:00
邱剑 d2a305f836 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '183e1ec0abcaef9eb7dd3ad8e4c753ea8f62a784':
  cloudcommon: resourcebase: add UpdateVersion to list columns
  cloudcommon: statusstandalone: allow specifying status on creation
 2018-09-17 10:51:42 +08:00
Yousong Zhou 9943fe6491 cloudcommon: resourcebase: add UpdateVersion to list columns 2018-09-15 13:59:39 +00:00
Yousong Zhou 63cd662762 cloudcommon: statusstandalone: allow specifying status on creation 2018-09-15 13:59:36 +00:00
邱剑 18068b0c1e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:39 +08:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0 
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:38 +08:00
Qiu Jian c624d4ec6c 修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root 
no-account-init无效 3. 其他问题...
 2018-09-15 17:05:17 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
李泽玺 33a98593cb Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '91ca98de309e2aeb2eb5af0f7c4cde213585c721':
  region: capabilities add specs
  region: query model by spec keys, filter by zone
  region: spec handler
 2018-09-15 10:16:30 +08:00
李泽玺 91ca98de30 Merge pull request #216 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-spec to release/2.1.0 
* commit '27f7e0d55f3104f0e9bab68fa77b254b45c6e3c2':
  region: capabilities add specs
  region: query model by spec keys, filter by zone
  region: spec handler
 2018-09-15 10:16:30 +08:00
Zexi Li 2ea45a7120 region: spec handler 2018-09-15 01:49:11 +08:00
邱剑 2855cfbf8a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ab8d120580317d802d6a1150c86b91bd0641a341':
  server create disk
  minor fix
  attach detach isolate device
  server attach detach network, change bandwidth, some bug fix
  guest desc, guest sendkey, fix disk delete
 2018-09-14 17:04:39 +08:00
wanyaoqi f910f6ada7 server attach detach network, change bandwidth, some bug fix 2018-09-14 11:50:22 +08:00
Qiu Jian 2ece630d4a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
 2018-09-14 11:26:23 +08:00
Qiu Jian 76231936a9 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913 2018-09-14 01:47:12 +08:00
Qiu Jian 447b0b4a1c undo changes to virtualjointbase.go 2018-09-14 01:42:59 +08:00
Qiu Jian f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
屈轩 730d83b733 resolve conflict 2018-09-13 16:25:56 +08:00
屈轩 ac979bc8c1 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-13 16:22:53 +08:00
周有松 019784716e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'f603867960fab8c2aa57a0b7f5eea8aaf12c67c9':
  validators: add Optional() to IValidator for use in ValidateUpdateData()
  mcclient: options: set details=true when --pending-delete-all is specified
  cloudcommon: virtualresource: show pending_deleted field when queried
  cloudcommon: virtualresource: optimize list with --field specified
 2018-09-13 11:59:58 +08:00
Yousong Zhou c66e264aff cloudcommon: virtualresource: show pending_deleted field when queried 2018-09-13 02:06:41 +00:00
Yousong Zhou 2ff04e3d97 cloudcommon: virtualresource: optimize list with --field specified 
No functional change
 2018-09-13 02:06:12 +00:00
wanyaoqi fb330c98be disk reset 
minor fixs
 2018-09-12 19:59:00 +08:00
屈轩 20381d0775 resolve conflict 2018-09-12 15:28:34 +08:00
邱剑 9c7b95bef5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '12b1ef939eb190af6c25790a0b8b5357aa678173':
  remove binary
  增加：镜像缓存加锁，避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
 2018-09-12 14:54:15 +08:00
Qiu Jian 1a30516b0f minor fixes 2018-09-12 01:14:33 +08:00
Qiu Jian 0a29b0add7 remove binary 2018-09-11 21:51:10 +08:00
Qiu Jian a6d8ee1173 增加：镜像缓存加锁，避免批量创建时重复上传镜像 2018-09-11 21:40:31 +08:00
Qiu Jian cda52bf9b8 remove binary 2018-09-11 13:09:40 +08:00
Qiu Jian 9a6eeb30f6 使用inmemory lockman 2018-09-11 13:07:51 +08:00
Qiu Jian 4f403ad9f2 initial commit 2018-09-10 23:30:31 +08:00