opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-01 03:22:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 30 Branches 712 Tags
d4fec00ec8944c2d688885e68cd63ceb669d4c62
Commit Graph
2108 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
邱剑 bac21fd477 Merge pull request #829 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-delete-cos-object to release/2.3.0 
* commit '89b81ec34ef5db6ba6f7e042394d240e0f6994ab':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:41 +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
邱剑 6a6c5dc5de Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e19dbfc4bf3e19532b4e18a8dbf5c1deb86bc91b':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 16:12:13 +08:00
屈轩 6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑 ae56b3d72a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9e01cafeaec39f59011d227e3406181b26a3c38d':
  fix insert iso
 2018-12-24 15:57:37 +08:00
邱剑 8c08a27eb6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '38a8bfa55899247a87b0ac7b55c89ac28877e014':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:27 +08:00
屈轩 5a590cffab 安全组不统计容器、物理机、Vmware数量 2018-12-24 15:17:12 +08:00
wanyaoqi 5d68e62537 fix insert iso 2018-12-24 14:58:41 +08:00
邱剑 9b6ec1285b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5b562dcb0a07116a5f2d32d0ebddf3f0d02a779e':
  treewide: 重新组织cloudcommon options
  cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY
  appsrv: FetchStruct(): 使用jsonutils
 2018-12-24 12:54:24 +08:00
Yousong Zhou 603e1be98c treewide: 重新组织cloudcommon options 
将cloudcommon.Options从cloudcommon.DBOptions中拿出来，并改名为CommonOptions
 2018-12-23 15:31:11 +00:00
Yousong Zhou cf639cf6dd cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY 2018-12-23 15:26:50 +00:00
Yousong Zhou ae40f39d32 appsrv: FetchStruct(): 使用jsonutils 2018-12-23 15:26:50 +00:00
邱剑 ca8a677aab Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'cf51c8ff9d092efff8c3d8009f22fb6cb739cc3f':
  add ping detect
 2018-12-22 18:27:56 +08:00
邱剑 cf51c8ff9d Merge pull request #821 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/regionv2-add-ping-detect-cornjob to release/2.4.0 
* commit '005061255ef1d57b51c3abaaeda16ab23fdf5ba9':
  add ping detect
 2018-12-22 18:27:55 +08:00
wanyaoqi 005061255e add ping detect 2018-12-22 18:23:19 +08:00
李泽玺 e9c262c8a6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f15e49c6a1ff347eea63fe7a93d95722dd01261':
  climc: k8s app support create pvc
 2018-12-22 18:14:31 +08:00
李泽玺 6f15e49c6a Merge pull request #819 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-app-pvc to release/2.4.0 
* commit '294b382c897c1bba83067b448118db243a01a0e3':
  climc: k8s app support create pvc
 2018-12-22 18:14:31 +08:00
邱剑 7eb11ae4ea Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2eec38953c52f2f59956a8f29e5400c17be0a613':
  修正worker状态信息
 2018-12-22 17:08:00 +08:00
邱剑 5226973908 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '51971ebb318a750d1f2cb1fb3522dd57576d9312':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
邱剑 51971ebb31 Merge pull request #818 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-worker-stats to release/2.2.0 
* commit 'e768369181f3f264f551d3e40da7ec89e5cb0a6d':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
邱剑 2eec38953c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '522697390818755e32964021e44bff63e752b8ee':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
Zexi Li 294b382c89 climc: k8s app support create pvc 2018-12-22 17:07:39 +08:00
屈轩 e768369181 修正worker状态信息 2018-12-22 17:05:37 +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
Qiu Jian 3f758e193a minor fixes 2018-12-22 00:17:29 +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 fdaec75067 在rowsToArray中进行defer rows.Close() 2018-12-21 22:13:39 +08:00
邱剑 6f644053aa Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e32ba61170302a3c71d31fd8c77f2e7dfd2655b8':
  修正：可用cloud-region和zone列表不包含私有云的cloud-region和zone
 2018-12-21 22:04:52 +08:00
邱剑 e32ba61170 Merge pull request #811 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-usable-region-exclude-private-region to release/2.4.0 
* commit '66b658918eb3a73f027222d99547fc418221416d':
  修正：可用cloud-region和zone列表不包含私有云的cloud-region和zone
 2018-12-21 22:04:51 +08:00
Qiu Jian cdec7fa2b7 改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 
将owner，admin统一为allow
 2018-12-21 22:02:04 +08:00
邱剑 6b0ffd9eaf Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2ce1740d6a8ec85b80c01d28621740b0feb23b27':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:36:17 +08:00
屈轩 f644fdb1b2 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 20:32:04 +08:00
邱剑 3821bee34d Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'bdda0a880eabfe47106d8fa74944a6c4e21b8850':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:02:37 +08:00
邱剑 0b9ecf9613 Merge pull request #808 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-name-check to release/2.3.0 
* commit '833e2161d9b46bb8b7a967c96e4ddefa8828fb4c':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:02:36 +08:00
邱剑 bdda0a880e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0b9ecf9613b41075cf5993a57b313005315d247c':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:02:36 +08:00
Qiu Jian 66b658918e 修正：可用cloud-region和zone列表不包含私有云的cloud-region和zone 2018-12-21 17:43:11 +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