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
1636 Commits
Author SHA1 Message Date
屈轩 bbc46f3171 冲突解决 2018-12-21 15:00:01 +08:00
邱剑 c35845f897 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '714ab83e87ca7803870961fd5bc8afb50c9f4a7c':
  阿里云错误重试
 2018-12-21 14:25:21 +08:00
邱剑 19e483d638 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c35845f89730962b5893cfb18326a75318fb7f47':
  阿里云错误重试
 2018-12-21 14:25:21 +08:00
屈轩 894517d622 阿里云错误重试 2018-12-21 12:14:57 +08:00
邱剑 a30b41bebe Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd4f11ae6dfc8a9d1c53b6f1d98aad05cef9e91cd':
  腾讯云支持余额查询
  cloudaccount增加更多统计信息
  添加cloudaccount项目信息
 2018-12-21 11:08:18 +08:00
Qiu Jian 8c65ead4b8 腾讯云支持余额查询 2018-12-21 10:22:53 +08:00
Qiu Jian 0566b17f99 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181220 
Conflicts:
	pkg/compute/models/cloudaccounts.go
 2018-12-21 00:44:42 +08:00
邱剑 aae3f2fc20 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '20be44f1f356324052d4f5d526e84284f80d51a7':
  避免auzre请求未释放文件描述符
 2018-12-20 19:56:44 +08:00
邱剑 20be44f1f3 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '48cc1b29c594c29690bda40dcc4e4142d6400b2e':
  避免auzre请求未释放文件描述符
 2018-12-20 19:56:44 +08:00
邱剑 48cc1b29c5 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'dc04c54dbb43c0e2783e6311859a76640577f2a2':
  避免auzre请求未释放文件描述符
 2018-12-20 19:56:44 +08:00
屈轩 bccebccc64 避免auzre请求未释放文件描述符 2018-12-20 19:50:06 +08:00
邱剑 e20182b159 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b7842d96bd722a0a7dfc874852260269c70debbf':
  exclude terminated vm
 2018-12-19 18:49:51 +08:00
邱剑 b7842d96bd Merge pull request #791 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit '992dbb7550c76edcefbfd5ac92c954d8141df28d':
  exclude terminated vm
 2018-12-19 18:49:51 +08:00
TangBin 992dbb7550 exclude terminated vm 2018-12-19 18:33:22 +08:00
邱剑 307188f58b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '75475e6d06af86ae35beba20f184ea8672352df3':
  make fmt
  update vendor
 2018-12-19 15:29:21 +08:00
Qiu Jian 2914e4dd6b make fmt 2018-12-19 01:02:23 +08:00
邱剑 e0dbfb7072 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '00d8dba7bda1b63260d1fde8036807463e9ad118':
  限定只允许创建RSA格式密钥
  disk rollback bugfix
  keypair bugfix
 2018-12-18 18:30:51 +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
TangBin 23c5f13fa8 keypair bugfix 2018-12-18 12:26:30 +08:00
邱剑 336f4bcb3c Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7d3e33b7c09c62692cd0329e596bb59d7b203f95':
  支持一次性设置多个安全组
  支持一次revoke多个安全组
  修改关联多个安全组参数格式
 2018-12-17 21:16:58 +08:00
屈轩 41926807f6 支持一次性设置多个安全组 2018-12-17 17:55:15 +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 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
屈轩 616ce78302 LB 返回参数更新 2018-12-15 14:28:02 +08:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
屈轩 9e4fbfa943 统一代码,添加日志 2018-12-15 13:45:00 +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 060660a1ea system disk resize 2018-12-14 11:50:54 +08:00
Qiu Jian 5f328c87bb 修正：将esxi 5.0的vmfs误判为nas 2018-12-13 23:14:18 +08:00
TangBin 1e26ab4975 filter by id method add id length check 2018-12-13 20:21:38 +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
TangBin bde6a55cc8 修复io1卷主机不能正常创建的问题 2018-12-13 10:23:32 +08:00
Qiu Jian 8c597cf135 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-vcenter-test 2018-12-12 23:29:16 +08:00
Qiu Jian 46aaba2474 make fmt 2018-12-12 23:24:34 +08:00
Qiu Jian 4ede254c1d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 22:56:19 +08:00
Zexi Li 2c5ed4b360 scheduler: make schedtag prefer and avoid strategy work 2018-12-12 19:56:21 +08:00
TangBin 3d320cb6c6 主机删除问题修复 2018-12-12 19:41:53 +08:00
TangBin 61d1a7258f 主机删除问题修复 2018-12-12 19:27:30 +08:00
TangBin 13fae52ea3 名称同步等问题修复 2018-12-12 18:56:44 +08:00
Qiu Jian 0cc221e78a Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 09:20:39 +08:00
Qiu Jian 4bd67d60ee 修正：由于datastore url信息不一致导致通过vcenter创建主机失败 2018-12-12 01:23:48 +08:00
Qiu Jian 5d5b9c8c85 增加：1. region的区域信息 2. 完善host的公有云账号信息 2018-12-12 00:09:07 +08:00
邱剑 f537b04ff3 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a4badaa095960557acc3bb40314384083314f79':
  阿里云错误处理
 2018-12-11 20:22:45 +08:00
邱剑 c836b5e23f Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f537b04ff31b0d255540cc95b23665d2a049f93c':
  阿里云错误处理
 2018-12-11 20:22:45 +08:00
邱剑 8a4badaa09 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ed401039b38d16546d674b07869e92e40f20ceeb':
  阿里云错误处理
 2018-12-11 20:22:44 +08:00
屈轩 cea2fcb6f3 阿里云错误处理 2018-12-11 19:43:33 +08:00