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
Qiu Jian 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
邱剑 273694b875 Merge pull request #1286 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-vmware-detch-disk-logic-and-other-misc to release/2.6.0 
* commit 'a93968e0d2590a3cad7ee3eccc248e6ef7ddc13c':
  fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. host enable netif failed if a fake ipaddr is given
 2019-03-20 22:20:51 +08:00
邱剑 0cb39ba521 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6c4f42d3806ebc95574977fcfa37989e5fcf1242':
  fix live migrate set status
 2019-03-20 22:20:41 +08:00
邱剑 6c4f42d380 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'b94d716af8292e001b55f34560559274c56cccb3':
  fix live migrate set status
 2019-03-20 22:20:41 +08:00
邱剑 b94d716af8 Merge pull request #1287 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-fix0320 to release/2.6.0 
* commit '0a45a1d8a176b0db04abf989086a37d8ec3525b7':
  fix live migrate set status
 2019-03-20 22:20:40 +08:00
wanyaoqi 0a45a1d8a1 fix live migrate set status 2019-03-20 20:12:56 +08:00
Zexi Li 1ed92bd176 fix: gpu server not work 2019-03-20 20:07:43 +08:00
TangBin bd9c8ca780 skus query fix 2019-03-20 16:28:51 +08:00
wanyaoqi 786db8f87f fix secgroup find by id or name 2019-03-20 15:44:48 +08:00
TangBin 5c724d0067 fix conflict 2019-03-20 15:18:35 +08:00
邱剑 e211643333 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '648875e7b7319dcb9e9a4d1ee6c65fe83a071c05':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
邱剑 648875e7b7 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4213db3eb605217796850dd42a266dd0372a7e85':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
邱剑 828a56e35e Merge pull request #1284 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-filter-by-vpc to release/2.8.0 
* commit '11776d2781b8ea1500e1db4aec9f32f8a2df9e90':
  filter by not in secgroup
  servers filter by vpc
 2019-03-20 15:01:35 +08:00
邱剑 f986db4706 Merge pull request #1285 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-seperate-private-cloud-on-premise to release/2.7.0 
* commit '99a10db949d80155dba0b830498f2bcef2774e37':
  fix: separate private cloud & on-premise
 2019-03-20 14:40:27 +08:00
邱剑 68cedd2cd6 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'f986db4706ff35462e6c7b88341c03e4aa72e2ac':
  fix: separate private cloud & on-premise
 2019-03-20 14:40:27 +08:00
邱剑 2bdeb11268 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'c82613b0f2bb666a15260ae2767e7ca37af42935':
  fix: turn delete prepaid vm to postpaid, so as to allow deleting the vm
 2019-03-20 14:39:58 +08:00
Qiu Jian a93968e0d2 fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. 
host enable netif failed if a fake ipaddr is given
 2019-03-20 14:37:37 +08:00
TangBin fc353606a9 DoListAll func add comment 2019-03-20 14:34:14 +08:00
TangBin 04e3e2458c network start&end ip fix 2019-03-20 14:30:50 +08:00
Zexi Li 076ad985cc move consts to apis 2019-03-20 12:08:15 +08:00
Zexi Li 6df6880501 define scheduler apis output and input structs 2019-03-20 12:03:29 +08:00
Zexi Li 19c341c297 scheduler: use compute models 2019-03-20 12:03:29 +08:00
wanyaoqi 11776d2781 filter by not in secgroup 2019-03-20 11:59:20 +08:00
Qiu Jian 99a10db949 fix: separate private cloud & on-premise 2019-03-19 22:14:01 +08:00
wanyaoqi ce04b4d4a9 servers filter by vpc 2019-03-19 21:40:29 +08:00
Zexi Li a81ee45f4a region: support cloudregion capabilities 2019-03-19 21:03:06 +08:00
Qiu Jian 2c022cd0ef fix: make virtual interface pointer more general 2019-03-19 20:18:48 +08:00
Qiu Jian cafc5daa63 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-baremetal-agent 2019-03-19 20:08:52 +08:00
TangBin 7ee86e7281 fix ucloud sync comment 2019-03-19 20:06:23 +08:00
Qiu Jian 29245c931c fix: turn delete prepaid vm to postpaid, so as to allow deleting the vm 2019-03-19 20:00:22 +08:00
邱剑 4922d3a876 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3ebe726100146b764598dbde96c546703e44d719':
  fix: baremetal tftp use local IP send response
 2019-03-19 19:53:25 +08:00
邱剑 68f4e5e425 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4922d3a8769c9a0c878046f9ac25db39b643dcfc':
  fix: baremetal tftp use local IP send response
 2019-03-19 19:53:25 +08:00
Zexi Li a92f781a2e fix: baremetal tftp use local IP send response 2019-03-19 19:44:08 +08:00
邱剑 116067b02a Merge pull request #1223 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-tag to release/2.8.0 
* commit '43daa1ceb420d8b6176e92ee7c023d51c9c8e962':
  用户自定义标签加前缀user:
  同步公有云key加上前缀
  限制key必须是中英文、数字或者_
  允许只传key进行过滤
  取消key以_开头key限制
  metadata返回列表使用复数
  支持server disk 过滤
  支持标签
 2019-03-19 15:59:46 +08:00
Qiu Jian 090984f9d2 fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent 2019-03-19 12:28:21 +08:00
屈轩 43daa1ceb4 用户自定义标签加前缀user: 2019-03-19 11:26:33 +08:00
邱剑 2a84a50b8b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '3f1dfac8f16f0e40f68277a7fda345113b4f1064':
  fix: more accurate sync_status update time
  fix: cloud provider sync time is not set in auto-sync cycles
 2019-03-19 08:20:56 +08:00
邱剑 3f1dfac8f1 Merge pull request #1268 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cloud-provider-missing-sync-time to release/2.7.0 
* commit 'ca39f480580030b8f25f686a08de8a0c23d1e90d':
  fix: more accurate sync_status update time
  fix: cloud provider sync time is not set in auto-sync cycles
 2019-03-19 08:20:55 +08:00
Qiu Jian ca39f48058 fix: more accurate sync_status update time 2019-03-18 22:16:20 +08:00
邱剑 a868005689 Merge pull request #1245 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit 'b67eb79797040b211d0b2ab4bb2f8988d06c78d4':
  fix cpu set
  fix cgroups
 2019-03-18 22:08:27 +08:00
邱剑 65a8a7bd82 Merge pull request #1278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-project-src to release/2.7.0 
* commit '4b6ddfc3cf36230fac78019fd4d79d3aaa175a0d':
  默认创建的project_src为local
 2019-03-18 20:55:32 +08:00
邱剑 ef058a61f1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '65a8a7bd82a30cd51b3ca17e6100bae75ea76393':
  默认创建的project_src为local
 2019-03-18 20:55:32 +08:00
邱剑 2a0600e7e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f71e16712851064d93f38f142c59ca7f2acac160':
  兼容disk json参数
 2019-03-18 20:55:12 +08:00
邱剑 21b464ab9e Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '2a0600e7e063105d22f9bc504381697d57f724f9':
  兼容disk json参数
 2019-03-18 20:55:12 +08:00
邱剑 f71e167128 Merge pull request #1256 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-create-disk-json-params to release/2.6.0 
* commit 'ec764d2d1d8ebf1686eeff9e94469dfc1b317485':
  兼容disk json参数
 2019-03-18 20:55:11 +08:00
屈轩 4b6ddfc3cf 默认创建的project_src为local 2019-03-18 20:13:53 +08:00
邱剑 51f62c973b Merge pull request #1264 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-query-fix to release/2.7.0 
* commit '6c040d4b76e21b5ffa6a53b1ba102ae2a4e730f2':
  skus group by GB
 2019-03-18 18:04:41 +08:00
邱剑 98e4b70606 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '51f62c973be602b42db85c6a3fde236d3049af6e':
  skus group by GB
 2019-03-18 18:04:41 +08:00
邱剑 7d1d851244 Merge pull request #1255 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/fix-package-dependence to release/2.8.0 
* commit '53ece34f3b424d4430b1198ea06a66456a4a9a12':
  merge const pkg from cloudcommon to compute
  fix package dependence
 2019-03-18 17:18:35 +08:00
TangBin 00d4f18396 ucloud sync 2019-03-18 16:22:52 +08:00