opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 27 Branches 687 Tags
bc02b3b433c56af54fee254bc6aec3c4fef019bb
Commit Graph
2027 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 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
Zexi Li cf39f5ed44 climc: server-deploy password 2018-08-16 18:47:10 +08:00
李泽玺 b9acbccb2a Automatic merge from release/2.1.0 -> master 
* commit 'a35c7096dd1345f85fab4bebb543703ff763d577':
  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
李泽玺 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
Zexi Li 7cad0d54f3 scheduler: network container server_type 2018-08-16 16:19:52 +08:00
TangBin bb5beccf47 add more resources interfaces 2018-08-16 14:19:01 +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
邱剑 1a87d1491e Automatic merge from release/2.1.0 -> master 
* commit 'c905dfd38898e326ee62bf7a1a638c00bb147167':
  修复check create data 使用keyword而不是keywordplural
 2018-08-15 21:45:45 +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
邱剑 5133aae2e7 Automatic merge from release/2.1.0 -> master 
* commit 'd3c5cf1568ff7947a1d4d1744835b7403d748007':
  添加disk 详情信息字段
 2018-08-15 21:03:10 +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
邱剑 b8c21fd665 Automatic merge from release/2.1.0 -> master 
* commit '81b7b329ab39cfc8b9c51311935226a5cc25cf5d':
  region: kvm server reset, fix climc parmas
 2018-08-15 21:02:57 +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
李泽玺 8e37209599 Automatic merge from release/2.1.0 -> master 
* commit 'c051506bc5281a5132492d4388f58e9c3cf8f325':
  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
屈轩 920fdb8683 添加公有云云硬盘同步操作 2018-08-15 18:51:39 +08:00
邱剑 7108fadfe0 Automatic merge from release/2.1.0 -> master 
* commit 'd44bb67d8c99ce26416cf76b1d7062112b178495':
  更新数据库前refresh资源信息
  多账号同步依赖manager_id区分
 2018-08-15 16:05: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
李泽玺 12151e7cd4 Automatic merge from release/2.1.0 -> master 
* commit '815ec7f94f1359dd5a176efe5cbfcff1a6af8216':
  更改sync算法
  同步阿里云安全组规则到本地
 2018-08-15 12:32:37 +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
邱剑 372e6022bc Automatic merge from release/2.1.0 -> master 
* commit '6759bc40b73f35aa910e83d97240cb3e65fe33a2':
  region: server-rebuid-root and fix bug on disk create and disk create failed
 2018-08-14 21:58:02 +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
邱剑 e78b368c24 Automatic merge from release/2.1.0 -> master 
* commit '26d3f6cc8144058103cc470d09b794796300bb1f':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:18 +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
邱剑 0126c85c33 Automatic merge from release/2.1.0 -> master 
* commit 'c98df1ad458c0024ec844c8fe48ac2c8eaa1cc29':
  fixup cronman/doc.go
  修正：cloudprovider的secret字段没有在list中获得
 2018-08-14 12:18:40 +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
李泽玺 d76b450c85 Automatic merge from release/2.1.0 -> master 
* commit 'bee99e79721dd5512560a0ad3f3ecbf224b7cbbc':
  climc list add joint filter
 2018-08-14 11:09:05 +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
邱剑 93fd815b03 Automatic merge from release/2.1.0 -> master 
* commit '160eea8146a0ac48e1e649b7a16bdd43f94c6678':
  添加aliyun disk resize内容
 2018-08-13 22:17:41 +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