lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-06 21:52:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,462 Commits 41 Branches 619 Tags
ea7141e6ec0f2a91c4fe9b70089d58418b2597c8
Commit Graph

5462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
周有松
ea7141e6ec Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '7a75f4d4b27659611f87bf2cb203d84c243a65b7':
  补充task失败处理
 2019-03-26 21:02:57 +08:00
周有松
7a75f4d4b2 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '69a256b2cef60a2f6ae253655ee2cff4fc5972f4':
  补充task失败处理
 2019-03-26 21:02:56 +08:00
周有松
69a256b2ce Merge pull request #1332 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-task-complete to release/2.6.0 
* commit '900b9df6392da5dc476dbd8327057f1f0ed15d06':
  补充task失败处理
 2019-03-26 21:02:56 +08:00
周有松
72286dcae2 Merge pull request #1345 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-guest-secgroup to release/2.8.0 
* commit '648d4d8ac258fa8e067c28776cb8ee1df79f8f87':
  避免新建机器时默认安全组未正常设置
 2019-03-26 20:51:40 +08:00
屈轩
648d4d8ac2 避免新建机器时默认安全组未正常设置 2019-03-26 20:49:56 +08:00
李泽玺
87478f4954 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '60aae0b672073eecd0ab12c91cc6c1d8fbc26920':
  + ACT_DELOCATE
 2019-03-26 18:47:59 +08:00
李泽玺
60aae0b672 Merge pull request #1343 in YUNIONIO/onecloud from hotfix/rex-logclient-enhance-260-2 to release/2.6.0 
* commit '46f68df060a15dd8c50b27a4935bb507bccfac24':
  + ACT_DELOCATE
 2019-03-26 18:47:59 +08:00
李泽玺
958d2aa988 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '87478f4954c7e5a19b69f8bb69850524b2de0774':
  + ACT_DELOCATE
 2019-03-26 18:47:59 +08:00
Zhang Dongliang
46f68df060 + ACT_DELOCATE 2019-03-26 18:46:46 +08:00
屈轩
900b9df639 补充task失败处理 2019-03-26 18:41:39 +08:00
张东亮
08fdf7217a Merge pull request #1342 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/reslove-conflict0326 to release/2.8.0 
* commit '51b40e9ade4a63027b92586e7a120c5f52b7a591':
  梳理 logclient 事件，增加黑名单
 2019-03-26 18:12:02 +08:00
wanyaoqi
51b40e9ade Merge branch 'release/2.7.0' into release/2.8.0 2019-03-26 18:08:04 +08:00
wanyaoqi
1b48b50e6a Merge branch 'release/2.7.0' of ssh://git.yunion.io/~wanyaoqi/onecloud into release/2.7.0 2019-03-26 18:03:35 +08:00
张东亮
7afce01220 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ed7a8232e1baf6b0765a2145523706e327c3e611':
  梳理 logclient 事件，增加黑名单
 2019-03-26 17:56:38 +08:00
张东亮
ed7a8232e1 Merge pull request #1340 in YUNIONIO/onecloud from hotfix/rex-logclient-enhance-260 to release/2.6.0 
* commit '8a0b32530217887acd4e9c9246798ea8c722a8f5':
  梳理 logclient 事件，增加黑名单
 2019-03-26 17:56:37 +08:00
Zhang Dongliang
8a0b325302 梳理 logclient 事件，增加黑名单 2019-03-26 17:53:12 +08:00
周有松
50dd610b60 Merge pull request #1328 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-sku-add-column-local-category to release/2.8.0 
* commit '011f8d3842a845f95a01cd7319cb91a5b60b4e2e':
  create private sku fix
  skus add local category
 2019-03-26 17:29:03 +08:00
周有松
4dc2ff02a1 Merge pull request #1337 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-merge-conflic-1329 to release/2.8.0 
* commit 'ad9c11a7a31b13ba710b41b8137c48efa6b764bc':
  更新vendor
  更新参数名称
  支持过滤未关联某个安全组的虚机列表
  完成安全组同步代码重构
 2019-03-26 16:47:57 +08:00
Yousong Zhou
ad9c11a7a3 Merge remote-tracking branch 'origin/release/2.7.0' into bugfix/yousong-merge-conflic-1329 2019-03-26 08:45:40 +00:00
周有松
83fde2aafb Merge pull request #1331 in YUNIONIO/onecloud from ~LIZEXI/onecloud:release/2.8.0 to release/2.8.0 
* commit 'ab0d45a24f555103a281e00ccfe0324bb4e6e8d0':
  修复 baremetal 创建的一系列问题:
 2019-03-26 16:33:51 +08:00
TangBin
011f8d3842 create private sku fix 2019-03-26 16:14:50 +08:00
Zexi Li
ab0d45a24f 修复 baremetal 创建的一系列问题: 
1. dhcp 并发请求冲突
2. 调度 storage 不适配
3. 获取 login info 字段不正确
 2019-03-26 16:08:06 +08:00
周有松
5967461f11 Merge pull request #1266 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-security-group-sync to release/2.7.0 
* commit '39f971ae29d42526512455014b342b4ce9e4d022':
  更新vendor
  更新参数名称
  支持过滤未关联某个安全组的虚机列表
  完成安全组同步代码重构
 2019-03-26 15:49:30 +08:00
屈轩
39f971ae29 更新vendor 2019-03-26 15:47:48 +08:00
周有松
871e59c4bb Merge pull request #1327 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-release-2.8-build-failed to release/2.8.0 
* commit 'd57e56b7be022e4cf113ba8e46215132515b9b9a':
  Fix: release/2.8.0 region build error
 2019-03-26 15:37:20 +08:00
TangBin
e4d2338994 skus add local category 2019-03-26 15:29:31 +08:00
Zexi Li
d57e56b7be Fix: release/2.8.0 region build error 2019-03-26 15:25:18 +08:00
周有松
739ccd9f0f Merge pull request #1324 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aws-get-instance-not-relay-on-get-images to release/2.8.0 
* commit 'f4fe2ba45f17d44d0155119c1928f969c9185dde':
  fix: adjust cloudaccount list columns
  fix: sync project may sync empty project ID
  fix: AWS getinstances failed because of missing AMI ID
 2019-03-26 12:12:53 +08:00
周有松
e0f5adfc3a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '686b802b790f5dae0bec60c37713cd8834490202':
  fix: validate IPMI address if it is given
 2019-03-26 12:12:32 +08:00
周有松
7c86a05f92 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'e0f5adfc3a78dcbfcf88b5fc95aac4e56020c6e0':
  fix: validate IPMI address if it is given
 2019-03-26 12:12:32 +08:00
周有松
686b802b79 Merge pull request #1325 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-validate-ipmi-address-if-given to release/2.6.0 
* commit '56a7602b661eb43e95eb9b98d03d548d5c2f6a8a':
  fix: validate IPMI address if it is given
 2019-03-26 12:12:31 +08:00
周有松
d71f4ff4b8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ddc2137a461d6aebdb07e5aa5697b15ce1c8caaa':
  公有云不支持iso启动
 2019-03-26 11:48:52 +08:00
周有松
88be1bf079 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'd71f4ff4b844a6a5feab99ff81d2373fd31c18f6':
  公有云不支持iso启动
 2019-03-26 11:48:52 +08:00
周有松
ddc2137a46 Merge pull request #1326 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cdrom-params-check to release/2.6.0 
* commit 'fedfcd582985969d2a246483dbc24fc1fe546904':
  公有云不支持iso启动
 2019-03-26 11:48:51 +08:00
屈轩
fedfcd5829 公有云不支持iso启动 2019-03-26 11:35:47 +08:00
Qiu Jian
f4fe2ba45f fix: adjust cloudaccount list columns 2019-03-25 22:39:53 +08:00
屈轩
845c159cac 更新参数名称 2019-03-25 22:27:59 +08:00
Qiu Jian
c969de28cb fix: sync project may sync empty project ID 2019-03-25 19:53:28 +08:00
邱剑
3906a74586 Merge pull request #1323 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-bugfix to release/2.6.0 
* commit 'e9d53e0c59e106801802947606132dcff3b49487':
  openstackcli:修复参数缺失bug
 2019-03-25 19:40:27 +08:00
邱剑
47d355c5bf Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '22e227989e03f6b1122644c10cb51829232593f0':
  openstackcli:修复参数缺失bug
 2019-03-25 19:40:27 +08:00
邱剑
22e227989e Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3906a745866a5c3035112f1b0a845c075e8a583a':
  openstackcli:修复参数缺失bug
 2019-03-25 19:40:27 +08:00
屈轩
e9d53e0c59 openstackcli:修复参数缺失bug 2019-03-25 17:47:33 +08:00
Qiu Jian
8f679a6932 fix: AWS getinstances failed because of missing AMI ID 2019-03-25 12:23:06 +08:00
Qiu Jian
56a7602b66 fix: validate IPMI address if it is given 2019-03-25 12:19:20 +08:00
李泽玺
29ff559f9d Merge pull request #1319 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-shcedtag-policy to release/2.8.0 
* commit '3ba6d4186cb9b69fec7e7c978cc3483d66768bea':
  dynamic schedule support resource type
 2019-03-25 11:18:11 +08:00
Zexi Li
3ba6d4186c dynamic schedule support resource type 2019-03-23 19:31:28 +08:00
邱剑
a48fc8d078 Merge pull request #1316 in YUNIONIO/onecloud from feature/zhengjj-tag-condition-api to release/2.8.0 
* commit 'd4771930166cd41ec94ecf7cac71f75aef45b1a5':
  add tag-detail-api
 2019-03-23 18:15:39 +08:00
邱剑
d4830c64b8 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '85019a73c6012effdd234e605b781af117ac3e0c':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:35 +08:00
邱剑
ce4f64a1fc Merge pull request #1318 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-bugfix to release/2.6.0 
* commit 'b95e315906e027b73cf169d3aed74bd914005af4':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:34 +08:00
邱剑
85019a73c6 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ce4f64a1fc2bca608f449762a2441591e8a8a36d':
  openstack:避免因disk没有设置volume_type而导致同步磁盘数据不全
  避免因openstack版本低导致不能设置系统盘storage_type导致部署失败
 2019-03-23 18:00:34 +08:00