opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-03 12:52:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,175 Commits 30 Branches 714 Tags
aae3f2fc205bace92dee1bfdf16b85ca254423ac
Commit Graph
2037 Commits
Author SHA1 Message Date
邱剑 aae3f2fc20 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '20be44f1f356324052d4f5d526e84284f80d51a7':
  避免auzre请求未释放文件描述符
 2018-12-20 19:56:44 +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
屈轩 bccebccc64 避免auzre请求未释放文件描述符 2018-12-20 19:50:06 +08:00
李泽玺 193e9da5c8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'bfe6e9cf02f9f6a8c7894f2199fb627610f9e6d5':
  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
周有松 65430a7d49 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '4d727c434842aaee2efdde7d6370dfc53ea70c72':
  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:30 +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
邱剑 26362d7f11 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '21843bf154e6a8052725fe410f33e519dea4c1ba':
  避免注册storage时,未初始化storagecache_id
 2018-12-19 18:54:01 +08:00
屈轩 aa949656b6 冲突解决 2018-12-19 18:52:47 +08:00
邱剑 e20182b159 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b7842d96bd722a0a7dfc874852260269c70debbf':
  exclude terminated vm
 2018-12-19 18:49:51 +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
邱剑 bd3bee527b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9e6b252d2a690aba069f4ed871146c443e96a0f3':
  fix sync storage status
 2018-12-19 18:32:33 +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
屈轩 8c41fc0044 避免注册storage时,未初始化storagecache_id 2018-12-19 17:24:24 +08:00
李泽玺 e20b1e8d66 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8231d79597be155739d05166e3699f0b0ce728ab':
  mcclient: region tasks client TaskComplete and TaskFailed
 2018-12-19 17:23:06 +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
邱剑 6dfb6481c1 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'aeeee04b7944b0d271c8d53fd250bb6ff5b1fbf8':
  fix: region-dns compile failed
 2018-12-19 17:21:51 +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
邱剑 307188f58b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '75475e6d06af86ae35beba20f184ea8672352df3':
  make fmt
  update vendor
 2018-12-19 15:29:21 +08:00
wanyaoqi 7dca09c419 fix sync storage status 2018-12-19 15:02:29 +08:00
Qiu Jian 2914e4dd6b make fmt 2018-12-19 01:02:23 +08:00
邱剑 e0dbfb7072 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '00d8dba7bda1b63260d1fde8036807463e9ad118':
  限定只允许创建RSA格式密钥
  disk rollback bugfix
  keypair bugfix
 2018-12-18 18:30:51 +08:00
邱剑 00d8dba7bd Merge pull request #781 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit 'cd3ac3333f19380dbb4f333975e062a9fd6747f8':
  限定只允许创建RSA格式密钥
  disk rollback bugfix
  keypair bugfix
 2018-12-18 18:30:51 +08:00
TangBin cd3ac3333f 限定只允许创建RSA格式密钥 2018-12-18 18:03:38 +08:00
李泽玺 4b3aa2810f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'dfe3d536346212e4562dc11ab09880460e5fe2d7':
  climc: k8s support v1.12.3
 2018-12-18 17:51:13 +08:00
Zexi Li d0e52a7625 climc: k8s support v1.12.3 2018-12-18 17:49:24 +08:00
邱剑 134bfc358c Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'a9f5f5fc36f6e240a5e6d9abcd347fbe647c83bb':
  zhengjiajie add new files
 2018-12-18 17:16:09 +08:00
邱剑 a9f5f5fc36 Merge pull request #780 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/add-bill-detail-api to release/2.4.0 
* commit 'ff3c6eb52623dfc13292e2b5284d9a774224301a':
  zhengjiajie add new files
 2018-12-18 17:16:09 +08:00
TangBin ca818e15b7 Merge branch 'release/2.4.0' into bugfix/tb-aws-support 2018-12-18 17:00:52 +08:00
TangBin ed3deb02bc disk rollback bugfix 2018-12-18 16:48:40 +08:00
zhengjiajie ff3c6eb526 zhengjiajie add new files 2018-12-18 16:04:06 +08:00
TangBin 23c5f13fa8 keypair bugfix 2018-12-18 12:26:30 +08:00
邱剑 1a52b40382 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'b1816b2b931d7850690071219bfd550d434c4665':
  SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner
 2018-12-18 10:15:53 +08:00
邱剑 b1816b2b93 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6af9216966532ad6816c21903217187a4ae69ac3':
  SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner
 2018-12-18 10:15:53 +08:00
Qiu Jian ceec25dfb4 SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner 2018-12-17 23:06:26 +08:00
邱剑 336f4bcb3c Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7d3e33b7c09c62692cd0329e596bb59d7b203f95':
  支持一次性设置多个安全组
  支持一次revoke多个安全组
  修改关联多个安全组参数格式
 2018-12-17 21:16:58 +08:00
邱剑 7d3e33b7c0 Merge pull request #777 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-add-secgroup to release/2.4.0 
* commit '41926807f6824a43dc6ff15919a3107f3ed5dc01':
  支持一次性设置多个安全组
  支持一次revoke多个安全组
  修改关联多个安全组参数格式
 2018-12-17 21:16:58 +08:00