opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 02:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
182 Commits 30 Branches 710 Tags
e9207cf7dcc6b97b8efa236955d273a6bae507a2
Commit Graph
182 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 e9207cf7dc Merge pull request #60 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/misc-201808-15 to release/2.1.0 
* commit '231e94fbd802ae00549b3a0c704b9fdcfcd259a1':
  1.fix corn run task with empyt context
 2018-08-16 19:08:54 +08:00
邱剑 03002aca3c Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'de75c8b308b71e06a4f1452c408a60ec6c4f6cd9':
  scheduler: network container server_type
 2018-08-16 19:04:57 +08:00
邱剑 de75c8b308 Merge pull request #63 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-scheduler-container-net to release/2.0.0 
* commit '7cad0d54f39b6bfa87474f80e5136f21e1f8d954':
  scheduler: network container server_type
 2018-08-16 19:04:57 +08:00
李泽玺 a35c7096dd Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'ecfd32480b5d90b78ea3c59ef435e554596db21a':
  zone capability的hypervisor去重
 2018-08-16 16:23:53 +08:00
李泽玺 ecfd32480b Merge pull request #61 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-capability-baremetal to release/2.0.0 
* commit 'e9d437d1736f2b5289ee571199d9c6cf3d3723e9':
  zone capability的hypervisor去重
 2018-08-16 16:23:53 +08:00
Zexi Li 7cad0d54f3 scheduler: network container server_type 2018-08-16 16:19:52 +08:00
Qiu Jian e9d437d173 zone capability的hypervisor去重 2018-08-16 11:47:06 +08:00
wanyaoqi 231e94fbd8 1.fix corn run task with empyt context 2018-08-15 21:52:24 +08:00
邱剑 c905dfd388 Merge pull request #59 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-create-data-check to release/2.1.0 
* commit '7d1d1d1d3759474e104758ab29cb433f961ce2c7':
  修复check create data 使用keyword而不是keywordplural
 2018-08-15 21:45:44 +08:00
屈轩 7d1d1d1d37 修复check create data 使用keyword而不是keywordplural 2018-08-15 21:40:32 +08:00
邱剑 d3c5cf1568 Merge pull request #58 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-disk to release/2.1.0 
* commit '2634b31ea5f7dad29dcabe5686ea1d498e7a1756':
  添加disk 详情信息字段
 2018-08-15 21:03:10 +08:00
邱剑 81b7b329ab Merge pull request #55 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-reset to release/2.1.0 
* commit 'f991bd67f15f73efa54cd765e19848879027ddbc':
  region: kvm server reset, fix climc parmas
 2018-08-15 21:02:56 +08:00
李泽玺 cb81481655 Merge pull request #54 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-token-endpoint-list to release/2.0.0 
* commit 'ea609cdbd1a7b677bbfe58a61a08fbfb7121d277':
  auth token add list endpoints method
 2018-08-15 19:52:35 +08:00
李泽玺 c051506bc5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'cb814816551a25ec5b81cf02f4cd4e839af7107d':
  auth token add list endpoints method
 2018-08-15 19:52:35 +08:00
邱剑 d44bb67d8c Merge pull request #56 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-provider-sync to release/2.1.0 
* commit '7cb13784c2696ef5acf9c3cd67925aa0f542e7cb':
  更新数据库前refresh资源信息
  多账号同步依赖manager_id区分
 2018-08-15 16:05:34 +08:00
屈轩 7cb13784c2 更新数据库前refresh资源信息 2018-08-15 15:41:07 +08:00
屈轩 97877eb3f6 多账号同步依赖manager_id区分 2018-08-15 15:18:46 +08:00
屈轩 2634b31ea5 添加disk 详情信息字段 2018-08-15 15:05:40 +08:00
wanyaoqi f991bd67f1 region: kvm server reset, fix climc parmas 2018-08-15 14:05:16 +08:00
李泽玺 815ec7f94f Merge pull request #46 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-server-secgroup to release/2.1.0 
* commit 'bc73e77e3594992110e74f05a9774ef49952f5ad':
  更改sync算法
  同步阿里云安全组规则到本地
 2018-08-15 12:32:36 +08:00
TangBin ea609cdbd1 auth token add list endpoints method 2018-08-15 10:54:48 +08:00
屈轩 bc73e77e35 更改sync算法 2018-08-14 22:48:11 +08:00
邱剑 6759bc40b7 Merge pull request #53 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-rebuild-root to release/2.1.0 
* commit 'baa7b9e09330352afd2e1088a9f1b837cb12bd09':
  region: server-rebuid-root and fix bug on disk create and disk create failed
 2018-08-14 21:58:01 +08:00
邱剑 26d3f6cc81 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b4dc54173695fcffd609559465f688eba94423d1':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:18 +08:00
邱剑 b4dc541736 Merge pull request #52 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-cache-success-connected-state to release/2.0.0 
* commit '8311f02839eab526a701bda27424e641bc6292ad':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:17 +08:00
wanyaoqi baa7b9e093 region: server-rebuid-root and fix bug on disk create and disk create failed 2018-08-14 16:09:35 +08:00
邱剑 c98df1ad45 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'a2d8b3bf994423f88f5306999a8eec8169eec133':
  fixup cronman/doc.go
  修正：cloudprovider的secret字段没有在list中获得
 2018-08-14 12:18:40 +08:00
邱剑 a2d8b3bf99 Merge pull request #49 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-cloud-provider-secret-listable to release/2.0.0 
* commit '575ec7a9b5dc420cf10d3ff5e63d90d67e470a37':
  fixup cronman/doc.go
  修正：cloudprovider的secret字段没有在list中获得
 2018-08-14 12:18:39 +08:00
Qiu Jian 8311f02839 修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接 2018-08-14 12:14:19 +08:00
李泽玺 bee99e7972 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '764978e994735df30cf9401df81546f3ce9df386':
  climc list add joint filter
 2018-08-14 11:09:05 +08:00
李泽玺 764978e994 Merge pull request #51 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/climc-list-add-joint-filter to release/2.0.0 
* commit '20fd01adc35789e8afe9f03ea16c6cd46d0dabab':
  climc list add joint filter
 2018-08-14 11:09:04 +08:00
wanyaoqi 20fd01adc3 climc list add joint filter 2018-08-14 11:07:12 +08:00
Qiu Jian 575ec7a9b5 fixup cronman/doc.go 2018-08-14 10:30:03 +08:00
邱剑 160eea8146 Merge pull request #50 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-disk-resize to release/2.1.0 
* commit '1afa94c200aa1ebc3295075bc1c535c60910d79c':
  添加aliyun disk resize内容
 2018-08-13 22:17:41 +08:00
屈轩 1afa94c200 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-disk-resize 2018-08-13 21:33:21 +08:00
屈轩 f8a299e167 添加aliyun disk resize内容 2018-08-13 20:27:29 +08:00
邱剑 72d8111048 Merge pull request #47 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-filter to release/2.1.0 
* commit 'cb62883e5da15475de7097d958ed5044ec291d27':
  添加disk provider过滤参数
 2018-08-13 20:23:45 +08:00
屈轩 cb62883e5d 添加disk provider过滤参数 2018-08-13 20:10:57 +08:00
Qiu Jian eeec417ebe 修正：cloudprovider的secret字段没有在list中获得 2018-08-13 20:02:32 +08:00
屈轩 6e8a43c43a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-server-secgroup 2018-08-13 17:21:42 +08:00
屈轩 2676c4fe07 解决冲突 2018-08-13 16:30:00 +08:00
邱剑 6762e86dbf Merge pull request #45 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-specify-network to release/2.0.0 
* commit 'c7656041a5eb21dcf88a3ce930de78552a5a8273':
  修正: 调度器指定网络批量失败的bug
 2018-08-13 14:59:09 +08:00
邱剑 b2c0bc8e63 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6762e86dbf52baa63b280257506480e793ff7c7e':
  修正: 调度器指定网络批量失败的bug
 2018-08-13 14:59:09 +08:00
Zexi Li c7656041a5 修正: 调度器指定网络批量失败的bug 2018-08-13 14:47:58 +08:00
邱剑 b340a66adf Merge pull request #44 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-conflict-resolve-20180813 to release/2.1.0 
* commit '72be6d8eddd50a68a878e888bf2eda075409b4ee':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 13:16:14 +08:00
Qiu Jian 72be6d8edd Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-conflict-resolve-20180813 
Conflicts:
	pkg/compute/models/disks.go
	pkg/compute/service/service.go
 2018-08-13 12:34:48 +08:00
邱剑 a4f252bbb2 Merge pull request #42 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-server-pending-delete-clean to release/2.0.0 
* commit 'f7d815eb641d531eaa5e21d6ff07113d056bdcd4':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 12:30:45 +08:00
Qiu Jian f7d815eb64 forget to update cronjob lastRun 2018-08-12 09:11:22 +08:00
Qiu Jian 1f8bf7fa04 修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描 2018-08-11 22:50:53 +08:00
邱剑 ed8ccfd158 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e0f42e6e3c3216602403476704e8304c48169a2f':
 2018-08-11 22:25:57 +08:00