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
2,970 Commits 27 Branches 687 Tags
41926807f6824a43dc6ff15919a3107f3ed5dc01
Commit Graph
1978 Commits
Author SHA1 Message Date
屈轩 41926807f6 支持一次性设置多个安全组 2018-12-17 17:55:15 +08:00
屈轩 d27a8c0ab2 支持一次revoke多个安全组 2018-12-17 15:44:34 +08:00
屈轩 15c2997b88 修改关联多个安全组参数格式 2018-12-17 14:08:51 +08:00
邱剑 41be263c39 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0a0e8414f3ed239267bb30b88163d4b30b8004a6':
  同步完成后清理调度缓存
 2018-12-17 12:26:45 +08:00
Qiu Jian e5416a27e0 fix Actionlog notes 2018-12-17 12:25:30 +08:00
屈轩 e95e1ac081 冲突解决 2018-12-17 12:16:35 +08:00
邱剑 b797c4a2dc Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7bab92d0114a5152e5f5488bb2a84c1a0d404f2a':
  同步完成后清理调度缓存
 2018-12-17 12:13:35 +08:00
屈轩 b50cd5f667 同步完成后清理调度缓存 2018-12-17 12:02:57 +08:00
Qiu Jian 00027c55bb Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181216-2 
Conflicts:
	pkg/compute/models/guest_actions.go
 2018-12-17 00:17:38 +08:00
屈轩 e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
邱剑 807af86fea Merge pull request #767 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-spec-memsize to release/2.4.0 
* commit 'efd3d565758de352c4e2965ab06b8bb9b0d762e9':
  region: 如果 memsize < 1024 按MB解析
 2018-12-15 17:23:09 +08:00
Zexi Li efd3d56575 region: 如果 memsize < 1024 按MB解析 2018-12-15 17:21:00 +08:00
周有松 f1e5d6d99e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '979d28217bb2fdc0929ea1d4c5c587b3728f4735':
  loadbalancercertificates: 变更Certificate字段为list:"user"
  loadbalancercertificates: 变更证书fingerprint字段名和格式
 2018-12-15 13:57:13 +08:00
屈轩 9e4fbfa943 统一代码,添加日志 2018-12-15 13:45:00 +08:00
屈轩 251765d4b6 未关联主机的安全组规则可以同步 2018-12-15 13:26:16 +08:00
Yousong Zhou d661881262 loadbalancercertificates: 变更Certificate字段为list:"user" 2018-12-15 04:47:36 +00:00
Yousong Zhou 40ed5bc5a6 loadbalancercertificates: 变更证书fingerprint字段名和格式 2018-12-15 04:47:36 +00:00
邱剑 a1fe24753b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b2baba16d29b6bce5a619b9350d3aa790eecd72c':
  region: host schedtag GetShortDesc panic
 2018-12-14 16:01:14 +08:00
Zexi Li d98ac09833 region: host schedtag GetShortDesc panic 2018-12-14 15:58:15 +08:00
邱剑 00cc2a138b Merge pull request #759 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-get-short-desc-ctx to release/2.4.0 
* commit '739ef05c86bdf37c64079c899f22b97e4610bc6f':
  minor fixes
  1. GetShortDesc()改为GetShortDesc(ctx context.Context) 2. VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
 2018-12-14 15:18:19 +08:00
唐斌 c48ab4a807 Merge pull request #756 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit 'dce7646d5580f6dba97ed7830d8a3355cef9d8c4':
  实例mem列表缺失部分mem fix
  system disk resize
  filter by id method add id length check
  sync eip bugfix
  sync eip bugfix
  sync eip bugfix
  fix instance type list marshal error
  instance type字段误写成了id
  主机删除问题修复
  主机删除问题修复
  名称同步等问题修复
 2018-12-14 14:51:01 +08:00
TangBin dce7646d55 实例mem列表缺失部分mem fix 2018-12-14 14:45:43 +08:00
Zexi Li 93a4085c9e - region: nil spec when prepaid host is not empty 
- scheduler: set default resource_type shared
 2018-12-14 13:25:59 +08:00
邱剑 495be7a833 Merge pull request #755 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-table-update to release/2.4.0 
* commit '17ec3fecb06dd64dcd8bd57e5e412fc710b06d54':
  skus delete query fix
  delete invalid sku while sync skus
  add clean invalid sku job
 2018-12-14 12:34:33 +08:00
TangBin 060660a1ea system disk resize 2018-12-14 11:50:54 +08:00
邱剑 97dd11e36e Merge pull request #760 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-set-sql-default-commit-bound to release/2.4.0 
* commit '310934116f5dd878fc220f7d67be1ffcf77e7b90':
  设置数据库缺省的cpu, memory, storage commit bound
 2018-12-14 11:45:09 +08:00
邱剑 4f821a9c7f Merge pull request #758 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-vmware-local-vmfs to release/2.4.0 
* commit '5f328c87bbbf7f9a18acb682bef524a3c28da950':
  修正：将esxi 5.0的vmfs误判为nas
 2018-12-14 11:14:58 +08:00
TangBin 17ec3fecb0 skus delete query fix 2018-12-14 09:52:22 +08:00
Qiu Jian 310934116f 设置数据库缺省的cpu, memory, storage commit bound 2018-12-14 06:25:46 +08:00
邱剑 6b834a930b Merge pull request #757 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-sql-query to release/2.4.0 
* commit '8d5897419a5bb571ccc7464a3f49e267c2019cac':
  fix manger query not filter deleted items
 2018-12-14 00:01:34 +08:00
邱剑 664daa15cb Merge pull request #753 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0 
* commit '1ee2e783aab092efb3f34199a36386783a94f382':
  zhengjj submit 4 files
 2018-12-14 00:01:24 +08:00
Qiu Jian 739ef05c86 minor fixes 2018-12-14 00:00:56 +08:00
Qiu Jian e18302866b 1. GetShortDesc()改为GetShortDesc(ctx context.Context) 
2.
VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
 2018-12-13 23:55:51 +08:00
Qiu Jian 5f328c87bb 修正：将esxi 5.0的vmfs误判为nas 2018-12-13 23:14:18 +08:00
wanyaoqi 8d5897419a fix manger query not filter deleted items 2018-12-13 21:15:53 +08:00
TangBin 1e26ab4975 filter by id method add id length check 2018-12-13 20:21:38 +08:00
TangBin cc6d3a5991 delete invalid sku while sync skus 2018-12-13 19:49:30 +08:00
TangBin ba5af9208a sync eip bugfix 2018-12-13 19:44:48 +08:00
TangBin a7beb01aca sync eip bugfix 2018-12-13 19:23:42 +08:00
TangBin b721fce391 sync eip bugfix 2018-12-13 19:17:00 +08:00
邱剑 a3f9158529 Merge pull request #754 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-more-baselist-opts to release/2.4.0 
* commit 'b5cb5e055e9f4ad3ff760e48bed2e49fc34ca617':
  vendor: run "dep ensure -update yunion.io/x/structarg"
  vendor: run "dep ensure"
  climc: 将xx-list --{provider,manager,account}放到BaseListOptions
  mcclient: options: routetables: fix compilation
 2018-12-13 18:46:55 +08:00
邱剑 e08c511bb4 Merge pull request #751 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-ignore-data-disk-rebuild-failure to release/2.4.0 
* commit 'f262783db644e2f48afaa147acb5f26cf9059267':
  暂时忽略rebuild data disk的错误
 2018-12-13 18:38:57 +08:00
邱剑 0d32748db8 Merge pull request #752 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-optimize-fetch-cloud-provider-info to release/2.4.0 
* commit '0f4729ae506f18f66ea730f8cedc011da38525e0':
  改进：获取provider/region ext id/zone ext id不需要访问cloud provider driver，提高访问效率
 2018-12-13 18:18:12 +08:00
Yousong Zhou 114f7c721e climc: 将xx-list --{provider,manager,account}放到BaseListOptions 2018-12-13 09:51:19 +00:00
TangBin 34ed406ddd add clean invalid sku job 2018-12-13 17:44:48 +08:00
Yousong Zhou 9a8b9bf7b1 mcclient: options: routetables: fix compilation 2018-12-13 09:39:01 +00:00
TangBin fb94b43dc2 fix instance type list marshal error 2018-12-13 16:26:42 +08:00
TangBin 3610828f94 instance type字段误写成了id 2018-12-13 15:51:42 +08:00
zhengjiajie 1ee2e783aa zhengjj submit 4 files 2018-12-13 14:51:35 +08:00
Qiu Jian 0f4729ae50 改进：获取provider/region ext id/zone ext id不需要访问cloud provider 
driver，提高访问效率
 2018-12-13 12:35:20 +08:00