opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-13 07:46:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,991 Commits 28 Branches 700 Tags
aeeee04b7944b0d271c8d53fd250bb6ff5b1fbf8
Commit Graph
2991 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 aeeee04b79 Merge pull request #787 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-region-dns-compile to release/2.4.0 
* commit 'a45d41ef85db428904bae5098931bfb89f9aacc3':
  fix: region-dns compile failed
 2018-12-19 17:21:50 +08:00
Zexi Li a45d41ef85 fix: region-dns compile failed 2018-12-19 16:41:56 +08:00
邱剑 75475e6d06 Merge pull request #784 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-update-vendor-2.4.0-20181219-2 to release/2.4.0 
* commit '2914e4dd6bf2b4fe7bcd4f8ea9acfe20672c2253':
  make fmt
  update vendor
 2018-12-19 15:29:20 +08:00
Qiu Jian 2914e4dd6b make fmt 2018-12-19 01:02:23 +08:00
Qiu Jian 3e0c2ecd73 update vendor 2018-12-19 01:02:04 +08:00
邱剑 00d8dba7bd Merge pull request #781 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit 'cd3ac3333f19380dbb4f333975e062a9fd6747f8':
  限定只允许创建RSA格式密钥
  disk rollback bugfix
  keypair bugfix
 2018-12-18 18:30:51 +08:00
TangBin cd3ac3333f 限定只允许创建RSA格式密钥 2018-12-18 18:03:38 +08:00
李泽玺 dfe3d53634 Merge pull request #782 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-v1.12.3 to release/2.4.0 
* commit 'd0e52a7625325fe212ab100016b8d428d67178f3':
  climc: k8s support v1.12.3
 2018-12-18 17:51:13 +08:00
Zexi Li d0e52a7625 climc: k8s support v1.12.3 2018-12-18 17:49:24 +08:00
邱剑 a9f5f5fc36 Merge pull request #780 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0 
* commit 'ff3c6eb52623dfc13292e2b5284d9a774224301a':
  zhengjiajie add new files
 2018-12-18 17:16:09 +08:00
TangBin ca818e15b7 Merge branch 'release/2.4.0' into bugfix/tb-aws-support 2018-12-18 17:00:52 +08:00
TangBin ed3deb02bc disk rollback bugfix 2018-12-18 16:48:40 +08:00
zhengjiajie ff3c6eb526 zhengjiajie add new files 2018-12-18 16:04:06 +08:00
TangBin 23c5f13fa8 keypair bugfix 2018-12-18 12:26:30 +08:00
邱剑 b1816b2b93 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6af9216966532ad6816c21903217187a4ae69ac3':
  SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner
 2018-12-18 10:15:53 +08:00
邱剑 6af9216966 Merge pull request #779 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-secgroup-rule-rbac-owner-check to release/2.3.0 
* commit 'ceec25dfb4ff92d94e3183b33129e343b075840c':
  SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner
 2018-12-18 10:15:52 +08:00
Qiu Jian ceec25dfb4 SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner 2018-12-17 23:06:26 +08:00
邱剑 7d3e33b7c0 Merge pull request #777 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-add-secgroup to release/2.4.0 
* commit '41926807f6824a43dc6ff15919a3107f3ed5dc01':
  支持一次性设置多个安全组
  支持一次revoke多个安全组
  修改关联多个安全组参数格式
 2018-12-17 21:16:58 +08:00
邱剑 a83f63e12b Merge pull request #778 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-create-qcloud-instance to release/2.3.0 
* commit '6e53c82aff47375dd1cab482db1b54714c9ef962':
  暂时取消系统盘大小校验
 2018-12-17 21:05:30 +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
邱剑 0a0e8414f3 Merge pull request #776 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.3.0 to release/2.3.0 
* commit 'e95e1ac0814cb0bc21ff0b9b0aaf35b24ef5641d':
  同步完成后清理调度缓存
 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
邱剑 af99ad1440 Merge pull request #773 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.4.0-20181216-2 to release/2.4.0 
* commit 'e5416a27e0bd9d9e9c851c288a4f08b0e3f242d3':
  fix Actionlog notes
  统一代码,添加日志
  未关联主机的安全组规则可以同步
 2018-12-17 12:26:17 +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
邱剑 7bab92d011 Merge pull request #774 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-clean-schedcache to release/2.1.0 
* commit 'b50cd5f667142aeb30a1658af129da13b1a62e1e':
  同步完成后清理调度缓存
 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
邱剑 f0bf4305c0 Merge pull request #769 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.3.0 to release/2.3.0 
* commit 'e61d1d17df493dd5c757c2d6237fae201d82af0b':
  统一代码,添加日志
  未关联主机的安全组规则可以同步
 2018-12-16 17:45:16 +08:00
屈轩 e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
邱剑 b212bff2c1 Merge pull request #766 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-rule-sync to release/2.2.0 
* commit '9e4fbfa943f886d12460dc7dcc7e3e0ed2df38b8':
  统一代码,添加日志
  未关联主机的安全组规则可以同步
 2018-12-15 22:50:33 +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
周有松 979d28217b Merge pull request #765 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit 'd6618812627c7d86e0e8db1c5de297a04312d91a':
  loadbalancercertificates: 变更Certificate字段为list:"user"
  loadbalancercertificates: 变更证书fingerprint字段名和格式
 2018-12-15 13:57:13 +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
邱剑 b2baba16d2 Merge pull request #764 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-host-details-schedtag-panic to release/2.3.0 
* commit 'd98ac0983323e5b99f44e8a33f4c783b46d4e8fe':
  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