opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
150 Commits 27 Branches 687 Tags
c98df1ad458c0024ec844c8fe48ac2c8eaa1cc29
Commit Graph
61 Commits
Author SHA1 Message Date
邱剑 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
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
邱剑 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 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
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
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
邱剑 4c2e94ac2b Merge pull request #25 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-bugfix-20180808 to release/2.0.0 
* commit '1585d24302c5f0bfe28f769ad2aeef86a8afed9c':
  修正：阿里云回收站主机恢复后无系统盘
  修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 3. 其他一些BUGfix
  temp commit
  temporary commit
 2018-08-10 11:38:23 +08:00
Yousong Zhou fd26ec4620 Merge remote-tracking branch 'origin/release/2.0.0' into release/2.1.0 2018-08-10 03:17:25 +00:00
Qiu Jian 1585d24302 修正：阿里云回收站主机恢复后无系统盘 2018-08-09 23:58:11 +08:00
Qiu Jian f0ec8a563e 修正：1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息 
3. 其他一些BUGfix
 2018-08-09 17:49:17 +08:00
Yousong Zhou 16b80dfefb cloudcommon: db: make master, slave id explict in joint resource base 2018-08-09 04:32:00 +00:00
Yousong Zhou 1bf9036c83 treewide: make explicit calls to JSONDict.Remove() and JSONDict.RemoveIgnoreCase 2018-08-09 04:30:56 +00:00
wanyaoqi f04463b526 server-stop, server-detach-disk, server-syncstatus, server-monitor, server-purge, 
fix code, add server-suspend, server-cancel-delete
server-change-config, fix disk-resize
server-deploy
 2018-08-09 10:17:04 +08:00
Qiu Jian 93be10117c Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-misc-bugfix-20180808 2018-08-09 00:44:45 +08:00
Qiu Jian fa6176267a temp commit 2018-08-09 00:38:36 +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 068136d6ab temporary commit 2018-08-08 23:00:01 +08:00
屈轩 115b3370e4 解决冲突 2018-08-08 22:05:11 +08:00
屈轩 d5954374cd 添加显示disk json详情 2018-08-08 19:51:01 +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
邱剑 fd563734b4 Merge pull request #18 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-resize-check-quota to release/2.1.0 
* commit '92f89fd575103d367fa10363b70114c5a309f0fe':
  bufix: 修复disk-resize quota检查问题
 2018-08-07 22:26:20 +08:00
屈轩 92f89fd575 bufix: 修复disk-resize quota检查问题 2018-08-07 21:49:15 +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
李泽玺 de465c01a5 Merge pull request #12 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-region-dns to release/2.0.0 
* commit 'bd612aecb00cc34b39f05cdde853f818bfc590c1':
  vendor: region-dns dependency packages
  dns: 支持 SRV
  dns: 支持反解
  - k8s client util - dns config sample
  Add region-dns service
 2018-08-07 20:53:28 +08:00
Qiu Jian 14446b5ddc 修正：python和golang版本对vmware的globalId处理方式不通，兼容处理 2018-08-07 20:06:07 +08:00
Qiu Jian 553fa30ce5 Update vendor vmware/govmomi 2018-08-07 20:05:55 +08:00
Qiu Jian 9eb41b392f 改进：1. 增加vmware cloud provider driver初步实现 2. 增加vmware vnc信息获取的支持 2018-08-07 20:05:33 +08:00
wanyaoqi bbe38254b9 add region in server details 2018-08-06 19:35:13 +08:00
李泽玺 d69b098b3b Merge pull request #7 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/disk to release/2.1.0 
* commit '896ea27aca5f9e014a95f1ffd38383c671021958':
  解决合并冲突
  add disk-op code
  fix code
  fix code
  fix code
  update jsonutils
  first commit
 2018-08-06 15:31:42 +08:00
Zexi Li 217f5a65ef - k8s client util 
- dns config sample
 2018-08-06 12:08:29 +08:00
邱剑 7e146ec2f5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'f6b5f4f1431a6e9b6e7b4d8dc187ac1cf50ce18e':
  修正：zone-create时候没有region时创建zone失败
 2018-08-05 08:08:47 +08:00
Qiu Jian e07968a1ea 修正：zone-create时候没有region时创建zone失败 2018-08-04 18:31:36 +08:00
屈轩 896ea27aca 解决合并冲突 2018-08-03 16:03:49 +08:00
屈轩 1ceac571eb 解决合并冲突 2018-08-02 14:59:40 +08:00
屈轩 9d0608378e add disk-op code 2018-08-02 14:52:24 +08:00
万垚奇 833be63716 Merge pull request #6 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/servers-ops-regionv2 to release/2.1.0 
* commit '7ff401a5b52e8aadac9c6cb1e68ec97d0474242a':
  server start. server stop. host drivers and some fix fix subtask log error
 2018-08-02 11:14:07 +08:00
Zexi Li 9ac3e1a19d Add region-dns service 2018-08-02 02:11:25 +08:00
wanyaoqi 7ff401a5b5 server start. server stop. host drivers and some fix 
fix subtask log error
 2018-08-01 22:30:01 +08:00