opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
265 Commits 30 Branches 714 Tags
7679056f550eb14d466e353c838f41fcd831d708
Commit Graph
39 Commits
Author SHA1 Message Date
邱剑 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 32d56101df minor updates 2018-08-24 16:32:08 +08:00
Qiu Jian 931ee5cef6 增加VM操作日志 2018-08-24 16:30:56 +08:00
Qiu Jian bce76a8ecc Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into bugfix/qj-resolve-conflict-2.1.0-20180824 2018-08-24 15:34:13 +08:00
Qiu Jian b23562b019 修正：删除阿里云VPC时由于有securitygroup导致删除失败 2018-08-23 20:39:10 +08:00
邱剑 665bec7db2 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '1df3f61a6f2cdfcddca5e3e5f97a45487d8548c0':
  dep: dep ensure update
 2018-08-21 16:12:55 +08:00
Yousong Zhou 935b8f02a3 dep: dep ensure update 
- jsonutils: bugfix for unmarshaling non-nil slice
 - prettytable: support printing multiline cells
 - sqlchemy: fix update for ptr fields

Update printutils to remove the redundant newline
 2018-08-21 07:53:49 +00: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
李泽玺 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
邱剑 26d3f6cc81 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b4dc54173695fcffd609559465f688eba94423d1':
  修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接
 2018-08-14 21:52:18 +08:00
Qiu Jian 8311f02839 修正：aliyun在成功连接后，会缓存成功状态，导致更新错误账号信息后还是显示成功连接 2018-08-14 12:14:19 +08:00
屈轩 f8a299e167 添加aliyun disk resize内容 2018-08-13 20:27:29 +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
屈轩 eccd7c7c17 同步阿里云安全组规则到本地 2018-08-11 16:36:24 +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
屈轩 b409dbfbf4 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-server-secgroup 2018-08-10 17:18:42 +08:00
Qiu Jian 6d81914119 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810 
Conflicts:
	pkg/cloudcommon/db/taskman/subtasks.go
	pkg/compute/models/guests.go
 2018-08-10 12:15:04 +08:00
Qiu Jian f0ec8a563e 修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 
3. 其他一些BUGfix
 2018-08-09 17:49:17 +08:00
Qiu Jian 6a876c18c7 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-merge-conflic-20180808 2018-08-08 23:28:08 +08:00
Qiu Jian b979ce9c45 Update fmt 2018-08-08 00:11:02 +08:00
Qiu Jian e589865d81 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vmware-vnc-support-v2.0 2018-08-08 00:09:50 +08:00
Zexi Li 02edf9d464 Merge branch 'release/2.0.0' of ssh://git.yunion.io/yunionio/onecloud into hotfix/lzx-dns-auto-merge-210 2018-08-07 21:00:51 +08:00
Qiu Jian 14446b5ddc 修正：python和golang版本对vmware的globalId处理方式不通，兼容处理 2018-08-07 20:06:07 +08:00
Qiu Jian 9eb41b392f 改进：1. 增加vmware cloud provider driver初步实现 2. 增加vmware vnc信息获取的支持 2018-08-07 20:05:33 +08:00
Zexi Li 217f5a65ef - k8s client util 
- dns config sample
 2018-08-06 12:08:29 +08:00
屈轩 896ea27aca 解决合并冲突 2018-08-03 16:03:49 +08:00
Zexi Li b5275a0c29 - mv mcclient to pkg/mcclient 
- vendor update
 2018-08-01 14:13:23 +08:00
Qiu Jian 89846777af Add back aliyun region-list 2018-07-31 08:54:08 +08:00
Zexi Li dea109d2ad CLI: aliyuncli added 2018-07-31 07:25:07 +08:00
Qiu Jian fcee2de326 修正：1. 由于系统盘大小设置单位未转换，导致阿里云创建主机失败 2. 
伪删除阿里云主机后，detach了系统盘，导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
 2018-07-31 00:42:18 +08:00
Zexi Li 37624f11e2 Add region service. 2018-07-30 12:27:27 +08:00
Zexi Li 270298fae2 Add scheduler service. 2018-07-30 11:18:02 +08:00