opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-02 20:38:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 30 Branches 714 Tags
d4fec00ec8944c2d688885e68cd63ceb669d4c62
Commit Graph
657 Commits
Author SHA1 Message Date
邱剑 d4fec00ec8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f034ce6629e909fa34be8c00e5073bdff84f5515':
  import image bucket exists error fix
 2018-12-24 18:22:13 +08:00
邱剑 f034ce6629 Merge pull request #830 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit '60f829945f12add02da06c44ad6e0bc425d675eb':
  import image bucket exists error fix
 2018-12-24 18:22:12 +08:00
邱剑 7a680f85ca Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5e48aba74bff1382591e853cd85d16c437d0a763':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:42 +08:00
邱剑 5e48aba74b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bac21fd477d7d776dd28556f61ebeee82dbc433f':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:42 +08:00
屈轩 89b81ec34e 删除腾讯云使用过的对象存储镜像文件 2018-12-24 17:06:13 +08:00
TangBin 60f829945f import image bucket exists error fix 2018-12-24 16:47:38 +08:00
邱剑 d1cb0e88ed Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '55e6c0c1f4a6c32c5c1b52d4e505b61c5f0746f8':
  minor fixes
  改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 将owner，admin统一为allow
 2018-12-22 16:45:59 +08:00
邱剑 55e6c0c1f4 Merge pull request #813 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-policy-test-single to release/2.4.0 
* commit '71a789f70ec19998cf81d87c460e7c10758f1a3e':
  minor fixes
  改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 将owner，admin统一为allow
 2018-12-22 16:45:58 +08:00
邱剑 28866c2149 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '18905406c4e9039f12e61c1df35759ca8fb931ff':
  阿里云API 错误重试
 2018-12-22 11:03:19 +08:00
屈轩 61a0bbed7c 冲突解决 2018-12-22 11:02:24 +08:00
邱剑 2f98d30fdf Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '7fdb27e1e5c0417078e7ef443055cd582cb8d8a3':
  阿里云API 错误重试
 2018-12-22 11:00:25 +08:00
邱剑 7fdb27e1e5 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1b93340eeb5bd6d59430ab5a96ec3dc6f3f551dd':
  阿里云API 错误重试
 2018-12-22 11:00:25 +08:00
屈轩 f450c82449 阿里云API 错误重试 2018-12-22 10:59:06 +08:00
Qiu Jian 71a789f70e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-rbac-policy-test-single 2018-12-22 09:57:57 +08:00
邱剑 ec77b6928b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '09c830d67dc466a2ff86947e58af74ab6ca793e3':
  在rowsToArray中进行defer rows.Close()
  修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接 3. app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 22:14:46 +08:00
邱剑 09c830d67d Merge pull request #810 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-db-rows-not-close to release/2.4.0 
* commit 'fdaec75067e0ddd2792546d0c4506fcd7cf372bd':
  在rowsToArray中进行defer rows.Close()
  修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接 3. app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 22:14:46 +08:00
Qiu Jian cdec7fa2b7 改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 
将owner，admin统一为allow
 2018-12-21 22:02:04 +08:00
Qiu Jian a6b865e7a2 修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 
服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接
3.
app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 17:10:34 +08:00
屈轩 5d706717ee 阿里云lb API请求错误重试 2018-12-21 15:51:45 +08:00
邱剑 205b06605a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '356fe05d6ee75f7c52f5fdf55f0317829b1475de':
  冲突解决
  阿里云错误重试
 2018-12-21 15:27:28 +08:00
屈轩 ff0136de3a 冲突解决 2018-12-21 15:06:55 +08:00
屈轩 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