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
wanyaoqi ff9f64279d bugfix: 1. fix sched fill disk desc (#13) 
2. fix image server not handle error
 2019-03-27 11:58:13 +08:00
周有松 c24d3c7b6a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '1b6a8dcc57fa362b6631db913e3eee298eba385b':
  同步完project信息后调用GetShortDesc
 2019-03-26 21:16:37 +08:00
周有松 1b6a8dcc57 Merge pull request #1344 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-project-sync to release/2.7.0 
* commit '50caa466998f65d32c1adb104f8fcd39ae8bdcd3':
  同步完project信息后调用GetShortDesc
 2019-03-26 21:16:37 +08:00
周有松 c9c3edef8c Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '40a7a3759a3a6d7f7dc5745ea4ef45bdb3661401':
  避免获取账号余额失败后不能进行后面的资源同步
 2019-03-26 21:10:17 +08:00
周有松 40a7a3759a Merge pull request #1336 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-ignore-balancer-error to release/2.7.0 
* commit '88d080c70455d0f8b5d8f5fc23cf601721d1d2cc':
  避免获取账号余额失败后不能进行后面的资源同步
 2019-03-26 21:10:16 +08:00
周有松 90598a6a07 Merge pull request #1277 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-ucloud-sync to release/2.8.0 
* commit '5694a7495e160541ef41787c923901cda3589020':
  add ucloud hypervisor
  add ucloud vnc info
  storage fix
  DoListAll func add comment
  network start&end ip fix
  fix ucloud sync comment
  ucloud sync
 2019-03-26 21:09:38 +08:00
周有松 43b09aae3d Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0cce83b9469bd8bdade266ce7b2a0c57eccc3ba4':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:20 +08:00
周有松 0cce83b946 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'a9040917e58d0cd2042a7aa1973fd965dfa0fba6':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:19 +08:00
周有松 a9040917e5 Merge pull request #1333 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-renew-expire-time to release/2.6.0 
* commit 'd1065ad97e1ec3d6a614ca1f518ce8bbc8245649':
  避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间
 2019-03-26 21:03:19 +08:00
周有松 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
屈轩 648d4d8ac2 避免新建机器时默认安全组未正常设置 2019-03-26 20:49:56 +08:00
TangBin 5694a7495e add ucloud hypervisor 2019-03-26 20:23:03 +08:00
屈轩 d1065ad97e 避免部分公有云续费后过期时间更新慢问题导致平台未能设置正常的过期时间 2019-03-26 19:43:36 +08:00
屈轩 50caa46699 同步完project信息后调用GetShortDesc 2019-03-26 19:38:42 +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
李泽玺 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
TangBin a46c8c02cc add ucloud vnc info 2019-03-26 18:46:03 +08:00
屈轩 900b9df639 补充task失败处理 2019-03-26 18:41:39 +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
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
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
屈轩 88d080c704 避免获取账号余额失败后不能进行后面的资源同步 2019-03-26 16:38:55 +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
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
屈轩 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
邱剑 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