opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,245 Commits 30 Branches 712 Tags
0cb39ba521fd30401e332bc25054db2b08efdfcd
Commit Graph
5245 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
李泽玺 4a938fef93 Merge pull request #1291 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-misc-gpu-scheduler to release/2.8.0 
* commit '1ed92bd1765144f4114d18646cd804a57ac2737c':
  fix: gpu server not work
 2019-03-20 20:09:58 +08:00
Zexi Li 1ed92bd176 fix: gpu server not work 2019-03-20 20:07:43 +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
邱剑 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
邱剑 4213db3eb6 Merge pull request #1279 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-baremetal-agent to release/2.6.0 
* commit '2c022cd0ef97aaf01229ce211d9d14dfdb0af371':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:40 +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
邱剑 c82613b0f2 Merge pull request #1282 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-turn-delete-prepaid-vm-to-postpaid-2.7.0 to release/2.7.0 
* commit '29245c931c3a7d2bf2796b82d83115576a4787c2':
  fix: turn delete prepaid vm to postpaid, so as to allow deleting the vm
 2019-03-20 14:39:58 +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
李泽玺 9cf99e33c4 Merge pull request #1276 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-storage-schedtag to release/2.8.0 
* commit '076ad985cc2a0ac15188545c029de964dfbba8a1':
  move consts to apis
  define scheduler apis output and input structs
  scheduler: use compute models
 2019-03-20 13:23:15 +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
李泽玺 6c4f925353 Merge pull request #1283 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-region-capability to release/2.8.0 
* commit 'a81ee45f4ac9e4211069c31f950c881d7aa98c8b':
  region: support cloudregion capabilities
 2019-03-19 23:24:31 +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
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
邱剑 3ebe726100 Merge pull request #1280 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-baremetal-tftp-localip to release/2.6.0 
* commit 'a92f781a2e79e751ed6b6810f3611bac762dd5b4':
  fix: baremetal tftp use local IP send response
 2019-03-19 19:53:25 +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
张东亮 a0b907dfb4 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3da0ecca28ea9c2b7e872df3700c0ec04443258b':
  vendor: add fsnotify lbagent
 2019-03-18 11:36:43 +08:00
张东亮 50d101de87 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'a0b907dfb43e83a89b36445fa81293f283dd0772':
  vendor: add fsnotify lbagent
 2019-03-18 11:36:43 +08:00
张东亮 3da0ecca28 Merge pull request #1275 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-vendor-add-fsnotify to release/2.6.0 
* commit 'cef5ee859e223de19278f8ff6f7047721ff03472':
  vendor: add fsnotify lbagent
 2019-03-18 11:36:42 +08:00
Yousong Zhou cef5ee859e vendor: add fsnotify lbagent 2019-03-18 03:34:58 +00:00