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
265 Commits 30 Branches 714 Tags
7679056f550eb14d466e353c838f41fcd831d708
Commit Graph
98 Commits
Author SHA1 Message Date
屈轩 7679056f55 添加storage过滤参数 2018-08-24 20:58:54 +08:00
邱剑 128bf00963 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '183405a31de1943eed4bb4599236ce4daf8cf2c6':
  minor updates
  增加VM操作日志
  修正：创建主机时只选择状态为 available 的网络
 2018-08-24 17:49:31 +08:00
Qiu Jian 58aecb256d 修正：创建主机时只选择状态为 available 的网络 2018-08-24 16:15:13 +08:00
Qiu Jian 8ead2a6471 minor fixes 2018-08-23 20:20:00 +08:00
Qiu Jian 242240cb68 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180823-1 2018-08-23 20:16:17 +08:00
Qiu Jian ac4275f48a 增加guest的region_external_id属性 2018-08-23 20:11:10 +08:00
Qiu Jian 4e1c1cd253 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180823 2018-08-23 18:39:09 +08:00
Qiu Jian e681012fd0 虚拟机增加region信息 2018-08-23 18:22:47 +08:00
邱剑 4c07ae8a1e Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '5359543470e4d351ba03ffd90f3e2ee9d5d4e004':
  增加：通过cloud provider来过滤虚拟机的功能
 2018-08-23 14:51:20 +08:00
Qiu Jian 0d6a9f33c6 增加：通过cloud provider来过滤虚拟机的功能 2018-08-23 13:32:11 +08:00
邱剑 bfabe69246 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'f5e86f1520b2781f61edcde2203054e78492bd72':
  修复因添加nil到errors导致野指针引用bug
 2018-08-21 20:52:49 +08:00
屈轩 241600f403 修复因添加nil到errors导致野指针引用bug 2018-08-21 20:47:40 +08:00
屈轩 71f5e19730 修复host==nil时调用host.GetHostDriver()出错问题 2018-08-21 15:45:04 +08:00
Zexi Li 13aa7b81e9 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-17 12:16:15 +08:00
Zexi cbc0c234f2 - climc: 设置 option 没有 subcommand 的情况下进入交互模式, 代码逻辑变清晰 
- make fmt
 2018-08-17 12:11:08 +08:00
邱剑 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
李泽玺 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
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
邱剑 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
屈轩 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
屈轩 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
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
屈轩 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
屈轩 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
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
Qiu Jian 1f8bf7fa04 修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描 2018-08-11 22:50:53 +08:00
邱剑 75d566a4cb Merge pull request #38 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-kvm-server-create to release/2.1.0 
* commit '9474752c05352f989b02b6e57b0cb6a5eef91c8a':
  fix server create
 2018-08-11 22:24:39 +08:00
Qiu Jian e112524185 minor updates 2018-08-11 22:24:06 +08:00
Qiu Jian f52557a3f8 修正：阿里云主机清理回收站功能 2018-08-11 22:21:25 +08:00
wanyaoqi 9474752c05 fix server create 2018-08-11 18:34:21 +08:00
邱剑 787191aa22 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'd3ca14ea723208afb9085064a8f4a43cd27326f5':
  改进：同步python和golang的validateupdatedata实现，允许修改主机名
 2018-08-11 18:19:17 +08:00
屈轩 eccd7c7c17 同步阿里云安全组规则到本地 2018-08-11 16:36:24 +08:00
Qiu Jian 53caf371f5 改进：同步python和golang的validateupdatedata实现，允许修改主机名 2018-08-11 15:19:50 +08:00
Zexi Li 090a9c5e86 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0 2018-08-11 15:11:24 +08:00
Zexi Li e6788bb75e add doc.go for each package 2018-08-11 14:41:38 +08:00
Zexi Li 22411ffb53 path move: github.com/yunionio -> yunion.io/x 2018-08-11 14:28:18 +08:00
李泽玺 cbd1b1c6aa Merge pull request #31 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-create to release/2.1.0 
* commit 'c0a213556796acd2854a298fd5b2df3abd7e6ef8':
  kvm server create
 2018-08-11 10:29:31 +08:00
wanyaoqi c0a2135567 kvm server create 2018-08-11 10:21:28 +08:00