opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,080 Commits 27 Branches 687 Tags
e19dbfc4bf3e19532b4e18a8dbf5c1deb86bc91b
Commit Graph
3080 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 e19dbfc4bf Merge pull request #827 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgorup-calc-guest-count to release/2.4.0 
* commit '6950eff7792701306edb71d034ea2fea98f241e1':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 16:12:13 +08:00
屈轩 6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑 9e01cafeae Merge pull request #824 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-insert-iso-task to release/2.4.0 
* commit '5d68e62537e8005abf315f16ed766fdf46f9357a':
  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
邱剑 38a8bfa558 Merge pull request #825 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-count-for-secgroup to release/2.2.0 
* commit '5a590cffab7c983fd7c2f161ff9d23dcfb70d684':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:26 +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
邱剑 5b562dcb0a Merge pull request #822 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-options to release/2.4.0 
* commit '603e1be98c293ce1e378c16947d720758d768803':
  treewide: 重新组织cloudcommon options
  cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY
  appsrv: FetchStruct(): 使用jsonutils
 2018-12-24 12:54:23 +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
邱剑 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
李泽玺 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
邱剑 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
邱剑 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
邱剑 e7da5921d8 Merge pull request #814 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-eip-change-owner to release/2.4.0 
* commit 'a80d7870eff50654fba18494bf4e7b4d35246929':
  增加climc eip-change-owner命令
 2018-12-22 11:41:03 +08:00
邱剑 18905406c4 Merge pull request #817 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hofix/qx-conflict-resolve-2.4.0 to release/2.4.0 
* commit '61a0bbed7c4a03e76633e2df8e47726e515acb37':
  阿里云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
邱剑 1b93340eeb Merge pull request #815 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-error-retry to release/2.1.0 
* commit 'f450c82449b6c2ae61b9db2232c9cb8aef294956':
  阿里云API 错误重试
 2018-12-22 11:00:24 +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
Qiu Jian a80d7870ef 增加climc eip-change-owner命令 2018-12-22 00:09:56 +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
邱剑 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
邱剑 2ce1740d6a Merge pull request #812 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-name-validate to release/2.4.0 
* commit 'f644fdb1b25a34de36996cb23b26d38680fabb53':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:36:16 +08:00
屈轩 f644fdb1b2 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 20:32:04 +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
屈轩 833e2161d9 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 15:49:22 +08:00
邱剑 356fe05d6e Merge pull request #807 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-conflict-2.4.0 to release/2.4.0 
* commit 'ff0136de3a0555e016c1b80251b57a0c3910c57b':
  冲突解决
  阿里云错误重试
 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
邱剑 714ab83e87 Merge pull request #805 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-api-retry to release/2.1.0 
* commit '894517d622c9cc8413df22e043f5009fdacfd777':
  阿里云错误重试
 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
邱剑 57fb16db3e Merge pull request #804 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-exclude-regions-with-disabled-cloud-account to release/2.4.0 
* commit 'e4ce79c687cdc4674f383d3e9a46d319c1ca074f':
  修正：当cloudaccount禁用后，无可用account的region应该被排除在可用的region列表中
 2018-12-21 11:08:26 +08:00
邱剑 d4f11ae6df Merge pull request #803 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.4.0-20181220 to release/2.4.0 
* commit '8c65ead4b873f4b63ede4840f5bc82d5ae9196f0':
  腾讯云支持余额查询
  cloudaccount增加更多统计信息
  添加cloudaccount项目信息
 2018-12-21 11:08:18 +08:00