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
6987 Commits
Author SHA1 Message Date
李泽玺 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
屈轩 5d706717ee 阿里云lb API请求错误重试 2018-12-21 15:51:45 +08:00
屈轩 833e2161d9 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 15:49:22 +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
邱剑 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
邱剑 b80ec5ad17 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '57fb16db3e1df7e3cd75a3bc8eeb712e7413b949':
  修正：当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
邱剑 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
唐斌 0ee17e3121 Merge pull request #796 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0 
* commit '591d2b92b1ded09c4a6ac4584aa6d3861f405573':
  price_info
 2018-12-21 10:11:00 +08:00
唐斌 ace1c8d07f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0ee17e3121615c54dc56d42066e599e2d156083b':
  price_info
 2018-12-21 10:11:00 +08:00
Qiu Jian d24211c12a cloudaccount增加更多统计信息 2018-12-21 09:03:34 +08:00
Qiu Jian e4ce79c687 修正：当cloudaccount禁用后，无可用account的region应该被排除在可用的region列表中 2018-12-21 00:58:16 +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
屈轩 55094be4c2 添加cloudaccount项目信息 2018-12-20 20:37:21 +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