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
tangbin 4c8bb1b447 fix merge 2019-01-01 17:09:48 +08:00
tangbin 764eb09481 merge release/2.5.0 2019-01-01 17:00:23 +08:00
tangbin 66e3e05acd merge 2019-01-01 16:34:35 +08:00
TangBin 3b91a27fc9 huawei cloud sync 2019-01-01 16:21:37 +08:00
Qiu Jian 8d60bc63c1 update vendor 2018-12-29 15:47:16 +08:00
Qiu Jian 018e372173 minor fixes 2018-12-29 13:43:49 +08:00
Qiu Jian 1e4789285d minor improvements 2018-12-28 20:24:23 +08:00
Qiu Jian dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian 21558d3dd2 final commit 
Conflicts:
	pkg/cloudcommon/policy/policy.go
	pkg/util/azure/storagecache.go
 2018-12-26 23:02:19 +08:00
Qiu Jian 102a8d2d12 temp commit 2018-12-26 22:59:59 +08:00
Qiu Jian 7d8cb846f9 move version, qemutil, qemuimg from cloudcommon to util 2018-12-26 22:59:59 +08:00
Qiu Jian b2f4c667eb fix bugs 2018-12-26 22:59:59 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian f9d9617220 update fmt & doc 2018-12-26 22:52:25 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
邱剑 65c9901ec6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '365be98ef5afa2fe14a0125ff1415b9bf683af0c':
  Avoid empty policy rules
 2018-12-25 16:34:16 +08:00
Qiu Jian d008d47f52 Avoid empty policy rules 2018-12-25 16:31:07 +08:00
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +08:00
邱剑 f10b31c0bd Merge pull request #834 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/client-session-add-ctx to release/2.4.0 
* commit '742a67b0f847813c5fa7245514330f44bbef0486':
  client session add context
 2018-12-25 15:25:52 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 552f100fd8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7d693d7f33ca9a72cf679e33150879234e210e20':
  允许删除阿里云过期包年包月主机
  修正： 1. 阿里云client空指针错误，通过wrapper隐藏 2. clean storage cached image处理异常情况 3. server purge不能purge带eip的主机
 2018-12-24 23:58:39 +08:00
邱剑 7d693d7f33 Merge pull request #833 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-20181224 to release/2.4.0 
* commit 'a28981d8064c4ef06bdc1af1c541b93ac0ce556a':
  允许删除阿里云过期包年包月主机
  修正： 1. 阿里云client空指针错误，通过wrapper隐藏 2. clean storage cached image处理异常情况 3. server purge不能purge带eip的主机
 2018-12-24 23:58:39 +08:00
Qiu Jian a28981d806 允许删除阿里云过期包年包月主机 2018-12-24 21:20:14 +08:00
Qiu Jian e1832849de 修正： 1. 阿里云client空指针错误，通过wrapper隐藏 2. clean storage 
cached image处理异常情况 3. server purge不能purge带eip的主机
 2018-12-24 20:13:05 +08:00
张东亮 6e709d87dc Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2bf3cac597363d85b352da0bd1f3a5ba29836861':
  make fmt
 2018-12-24 19:42:12 +08:00
张东亮 a49892b96d Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'aec8cedbf25f649fc66eb3b10079c824327e78be':
  make fmt
 2018-12-24 19:40:47 +08:00
张东亮 aec8cedbf2 Merge pull request #831 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit '5e4f1e54c327adb8354203984f64b96945ed94a9':
  make fmt
 2018-12-24 19:40:47 +08:00
Zhang Dongliang 2fd89c4ae6 make fmt 2018-12-24 19:36:31 +08:00
TangBin 5e4f1e54c3 make fmt 2018-12-24 19:25:08 +08:00
邱剑 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