opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-12 23:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,040 Commits 28 Branches 700 Tags
cdec7fa2b76835a1827bdc40f9cfaed55514399a
Commit Graph
3040 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian cdec7fa2b7 改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 
将owner，admin统一为allow
 2018-12-21 22:02:04 +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
邱剑 19e483d638 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c35845f89730962b5893cfb18326a75318fb7f47':
  阿里云错误重试
 2018-12-21 14:25:21 +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
屈轩 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
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
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
邱剑 a332ecc187 Merge pull request #801 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-project-info to release/2.3.0 
* commit '55094be4c27f6ea7842f2fda20d57f7ac1430502':
  添加cloudaccount项目信息
 2018-12-20 23:35:37 +08:00
屈轩 55094be4c2 添加cloudaccount项目信息 2018-12-20 20:37:21 +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
邱剑 dc04c54dbb Merge pull request #800 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-fd-leak to release/2.2.0 
* commit 'bccebccc6493126d0b5dc6c8679e86c2d6f5dd1b':
  避免auzre请求未释放文件描述符
 2018-12-20 19:56:43 +08:00
屈轩 bccebccc64 避免auzre请求未释放文件描述符 2018-12-20 19:50:06 +08:00
李泽玺 bfe6e9cf02 Merge pull request #798 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-raw-request-fd-leak to release/2.4.0 
* commit '314563bd2b7637c54b6cc2fc7ce5193d901e6d9f':
  fix: rawRequest resp body not close
 2018-12-20 18:27:44 +08:00
Zexi Li 314563bd2b fix: rawRequest resp body not close 2018-12-20 17:56:11 +08:00
zhengjiajie 591d2b92b1 price_info 2018-12-20 16:11:21 +08:00
周有松 4d727c4348 Merge pull request #795 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-appsrv to release/2.4.0 
* commit 'dfbd27fd3a9518176c9a547f0a51fd584c83374c':
  appsrv: remove debug code
  appsrv: use copy() for copying slice
  appsrv: rewrite TestRadixMatchParams()
  appsrv: fix TestWorkerManagerError()
  appsrv: fix fmt verb
  appsrv: use RWMutex for rootLock
  cronman: 改正app context key appname拼写
 2018-12-20 10:28:29 +08:00
Yousong Zhou dfbd27fd3a appsrv: remove debug code 2018-12-19 13:15:59 +00:00
Yousong Zhou a71d0518f4 appsrv: use copy() for copying slice 2018-12-19 13:15:59 +00:00
Yousong Zhou 27c9770017 appsrv: rewrite TestRadixMatchParams() 2018-12-19 13:15:59 +00:00
Yousong Zhou e7c6b8e7a5 appsrv: fix TestWorkerManagerError() 2018-12-19 13:15:59 +00:00
Yousong Zhou 5f2fb92caf appsrv: fix fmt verb 
Warningf format %] has unknown verb ]
 2018-12-19 13:15:59 +00:00
Yousong Zhou e6a6a9353b appsrv: use RWMutex for rootLock 2018-12-19 13:15:59 +00:00
Yousong Zhou 537a590d69 cronman: 改正app context key appname拼写 2018-12-19 13:15:59 +00:00
邱剑 2c5f7270b0 Merge pull request #794 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-sqlchemy-default-valut to release/2.4.0 
* commit '9976a7b0d4b7c6885c3dd5ab07e362c251680fc9':
  make dep
 2018-12-19 20:33:17 +08:00
wanyaoqi 9976a7b0d4 make dep 2018-12-19 20:27:49 +08:00
邱剑 55f1d34c0b Merge pull request #793 in YUNIONIO/onecloud from ~NINGYU/onecloud:feature/ningyu-alarmlog-create to release/2.4.0 
* commit '89d2e6c319c0d60107913a0ffecc7968d840e120':
  feat: 创建报警日志
 2018-12-19 20:12:32 +08:00
ningyu 89d2e6c319 feat: 创建报警日志 2018-12-19 20:08:58 +08:00
邱剑 21843bf154 Merge pull request #792 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.4.0 to release/2.4.0 
* commit 'aa949656b62c819eb7c6c0826acd0f51b0956fec':
  避免注册storage时,未初始化storagecache_id
 2018-12-19 18:54:01 +08:00
屈轩 aa949656b6 冲突解决 2018-12-19 18:52:47 +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
邱剑 65de01a3b0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c58d4cbb9de9bcc9f75818407a2b5962f9962897':
  避免注册storage时,未初始化storagecache_id
 2018-12-19 18:33:27 +08:00
邱剑 c58d4cbb9d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'db72c9340feb4fbffddc34c632759036a7157e1d':
  避免注册storage时,未初始化storagecache_id
 2018-12-19 18:33:27 +08:00
邱剑 db72c9340f Merge pull request #788 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storagecache-id to release/2.1.0 
* commit '8c41fc004408b7410d6bb769f4f0e4b6d86b3c5b':
  避免注册storage时,未初始化storagecache_id
 2018-12-19 18:33:26 +08:00
TangBin 992dbb7550 exclude terminated vm 2018-12-19 18:33:22 +08:00
邱剑 9e6b252d2a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a71082b98dc1639393a1acae8bbfdf78fbafe688':
  fix sync storage status
 2018-12-19 18:32:33 +08:00
邱剑 a71082b98d Merge pull request #789 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20181219-02 to release/2.3.0 
* commit '7dca09c4196eebdedd9f5bee2101a98e357d8fd1':
  fix sync storage status
 2018-12-19 18:32:33 +08:00
屈轩 8c41fc0044 避免注册storage时,未初始化storagecache_id 2018-12-19 17:24:24 +08:00
李泽玺 8231d79597 Merge pull request #786 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-module-task-action to release/2.4.0 
* commit 'cfe011d6e9a9825c6026e5836a3ad62bfa258596':
  mcclient: region tasks client TaskComplete and TaskFailed
 2018-12-19 17:23:06 +08:00
邱剑 aeeee04b79 Merge pull request #787 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-region-dns-compile to release/2.4.0 
* commit 'a45d41ef85db428904bae5098931bfb89f9aacc3':
  fix: region-dns compile failed
 2018-12-19 17:21:50 +08:00
Zexi Li a45d41ef85 fix: region-dns compile failed 2018-12-19 16:41:56 +08:00
Zexi Li cfe011d6e9 mcclient: region tasks client TaskComplete and TaskFailed 2018-12-19 16:11:21 +08:00