opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 15:01:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1011 Commits
Author SHA1 Message Date
邱剑 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 dd38b2b53d validators: add Optional() to IValidator for use in ValidateUpdateData() 2018-09-13 02:06:41 +00: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
邱剑 12b1ef939e Merge pull request #183 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-lockman-enable-inmemery-lock to release/2.1.0 
* commit '0a29b0add76df86c0d5081db809631c22d728bf1':
  remove binary
  增加：镜像缓存加锁，避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
 2018-09-12 14:54:15 +08:00
邱剑 81cb8297ba Merge pull request #188 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-redundant-params to release/2.2.0 
* commit '1a30516b0f82d34401c0f78ff69317a343c0aafa':
  minor fixes
  修正：radix match params只包含匹配的参数
 2018-09-12 14:53:37 +08:00
邱剑 922f2ac07e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '8ff02cfd90495a86bad9c1d14107f9a9ca3189de':
  mcclient: options: accomodate time.Time type
  mcclient: options: allow listing all resources including pending_deleted
  validators: rework error handling
  validators: StringMultiChoicesValidator: add test case
 2018-09-12 14:09:25 +08:00
Yousong Zhou cc70be165f validators: rework error handling 
- Return httperrors by default (return ValidateError when testing)
 - Special casing sql.ErrNoRows for model not found
 2018-09-12 01:26:52 +00:00
Yousong Zhou 2b691c5dbd validators: StringMultiChoicesValidator: add test case 2018-09-12 01:26:52 +00: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
邱剑 786489162b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e03a31a65d32799840888d124d61f731382569ae':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
邱剑 e03a31a65d Merge pull request #182 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0 
* commit 'ad67ecb7dd46cc0ecf32c3a1104da9d89b9b8054':
  dep: update structarg
  climc: trim angle brackets for required options
  validators: add BoolValidator
  validators: add ValidatorStringMultiChoices
 2018-09-11 00:12:39 +08:00
Yousong Zhou 75f38447fd validators: add BoolValidator 2018-09-10 16:08:17 +00:00
Yousong Zhou b4f00220f9 validators: add ValidatorStringMultiChoices 2018-09-10 16:08:13 +00:00
邱剑 a42cef6e77 Merge pull request #160 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '5b5733916624792de9fe4c1aa438c0d320e80a4e':
  fix code
  - local disk snapshot create and delete - auto snapshot everyday - rewrite cornman - make dep and some fix - fix conflict
 2018-09-10 23:55:25 +08:00
邱剑 cb4a0c0185 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'bc9979d918c926fc1fb865602ffae795ff2e79cc':
  修正：secgroup initializedb需要admin token，修改initAuth同步执行，确保admin token可用
 2018-09-10 23:53:11 +08:00
Qiu Jian 4f403ad9f2 initial commit 2018-09-10 23:30:31 +08:00
Qiu Jian 2c9e203bb3 修正：secgroup initializedb需要admin 
token，修改initAuth同步执行，确保admin token可用
 2018-09-10 16:03:42 +08:00
李泽玺 ee447e4750 Merge pull request #173 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-merge-path-params-into-querystring to release/2.2.0 
* commit '035ad926c85b8e7d5a341253253a3453ac0e4ef9':
  改进：把path中的params合并到querystring中，这样允许在listItemFilter中访问这些params参数，并且实现对数据的过滤
 2018-09-10 10:17:56 +08:00
Qiu Jian 035ad926c8 改进：把path中的params合并到querystring中，这样允许在listItemFilter中访问这些params参数，并且实现对数据的过滤 2018-09-08 17:33:46 +08:00
wanyaoqi 4f2b50a869 - local disk snapshot create and delete 
- auto snapshot everyday
- rewrite cornman
- make dep and some fix
- fix conflict
 2018-09-06 16:22:36 +08:00
Qiu Jian 7c795f7975 修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 
2.
系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-06 15:10:55 +08:00
Qiu Jian 45f7f6febe Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-elastic-ip 2018-09-04 23:46:43 +08:00