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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
邱剑 63118445a4 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'cd3d906fd68f4a51346b43783dab58d9b67724e4':
  暂时取消系统盘大小校验
 2018-12-17 21:05:31 +08:00
邱剑 cd3d906fd6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a83f63e12ba6c1170546596fb71718dbb2e765cb':
  暂时取消系统盘大小校验
 2018-12-17 21:05:30 +08:00
屈轩 41926807f6 支持一次性设置多个安全组 2018-12-17 17:55:15 +08:00
屈轩 6e53c82aff 暂时取消系统盘大小校验 2018-12-17 17:43:08 +08:00
屈轩 d27a8c0ab2 支持一次revoke多个安全组 2018-12-17 15:44:34 +08:00
屈轩 15c2997b88 修改关联多个安全组参数格式 2018-12-17 14:08:51 +08:00
邱剑 70c5b359d2 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '41be263c39d91743a703f07dac295f0695074036':
  同步完成后清理调度缓存
 2018-12-17 12:26:45 +08:00
邱剑 41be263c39 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0a0e8414f3ed239267bb30b88163d4b30b8004a6':
  同步完成后清理调度缓存
 2018-12-17 12:26:45 +08:00
邱剑 caef89da96 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'af99ad1440b9ed7f89eec47948c3dff82a830b1e':
  fix Actionlog notes
  统一代码,添加日志
  未关联主机的安全组规则可以同步
 2018-12-17 12:26:18 +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
屈轩 db8e4b93d9 校验账号删除时是否有负载均衡资源未清理完成 2018-12-16 13:13:37 +08:00
屈轩 e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
邱剑 e19efa9856 Merge pull request #763 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-cloud-lb-sync to release/2.5.0 
* commit '616ce7830234318879a0b6b0f752fa31a479fda6':
  LB 返回参数更新
  支持同步公有云负载均衡信息同步
 2018-12-15 22:53:51 +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
屈轩 616ce78302 LB 返回参数更新 2018-12-15 14:28:02 +08:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +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