opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
89 Commits 27 Branches 687 Tags
094600ae65fe2ded0de3597e796d8a1c4e43a85d
Commit Graph
89 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李泽玺 094600ae65 Merge pull request #23 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/kvm-server-deploy to release/2.1.0 
* commit 'f04463b5269157e03739412952ee0c38c2688bac':
  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 17:33:57 +08: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
邱剑 4d5acb82f3 Merge pull request #24 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-merge-conflic-20180808 to release/2.1.0 
* commit '6a876c18c767cb999159d70a448609161f29b7b5':
  Update fmt
  修正：python和golang版本对vmware的globalId处理方式不通，兼容处理
  Update vendor vmware/govmomi
  改进：1. 增加vmware cloud provider driver初步实现 2. 增加vmware vnc信息获取的支持
 2018-08-08 23:37:26 +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
邱剑 a156df7e0f Merge pull request #22 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-diskinfo to release/2.1.0 
* commit '115b3370e4be2afda5e798099698338dcfb2cc20':
  添加显示disk json详情
 2018-08-08 22:28:44 +08:00
屈轩 115b3370e4 解决冲突 2018-08-08 22:05:11 +08:00
屈轩 d5954374cd 添加显示disk json详情 2018-08-08 19:51:01 +08:00
邱剑 30da473569 Merge pull request #17 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-vmware-vnc-support-v2.0 to release/2.0.0 
* commit 'b979ce9c45dc3eb2e40b2f958e824b4e09ff2120':
  Update fmt
  修正：python和golang版本对vmware的globalId处理方式不通，兼容处理
  Update vendor vmware/govmomi
  改进：1. 增加vmware cloud provider driver初步实现 2. 增加vmware vnc信息获取的支持
 2018-08-08 18:42:55 +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
邱剑 b1f933290e Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'ab44a1f54772cf13c9868b88d048c7f6ada91fba':
  climc: 支持获取 k8s 集群直连的配置
 2018-08-07 18:40:43 +08:00
邱剑 ab44a1f547 Merge pull request #15 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-kube-config to release/2.0.0 
* commit 'de79ccfa565b45ca1986df3368d93a7c8bd58e3b':
  climc: 支持获取 k8s 集群直连的配置
 2018-08-07 18:40:43 +08:00
Zexi Li bd612aecb0 vendor: region-dns dependency packages 2018-08-07 18:27:28 +08:00
Zexi Li de79ccfa56 climc: 支持获取 k8s 集群直连的配置 2018-08-07 18:22:41 +08:00
邱剑 89fea5c4bf Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '73dd25ac22e0f005e53238f3c5b0be4b7a9bd4c1':
  scheduler: allow run container in kubelet host
 2018-08-07 12:11:47 +08:00
邱剑 73dd25ac22 Merge pull request #14 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-host-run-container to release/2.0.0 
* commit '953d77cc8ee95bfeb44cd4ffc53bbd7136ecad09':
  scheduler: allow run container in kubelet host
 2018-08-07 12:11:46 +08:00
Zexi Li 953d77cc8e scheduler: allow run container in kubelet host 2018-08-07 12:09:20 +08:00
李泽玺 b40e94592f Merge pull request #13 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-region-in-details to release/2.1.0 
* commit 'bbe38254b93adbcf424e97cbcba8ca2cc3cdc465':
  add region in server details
 2018-08-06 20:31:43 +08:00
wanyaoqi bbe38254b9 add region in server details 2018-08-06 19:35:13 +08:00
Zexi Li 4e7f006498 dns: 支持 SRV 2018-08-06 17:13:07 +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 f4ab21afc6 dns: 支持反解 2018-08-06 15:02:38 +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
邱剑 f6b5f4f143 Merge pull request #11 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-create-missing-region to release/2.0.0 
* commit 'e07968a1eabcdc9ef68aa39f835fca36b820d0da':
  修正：zone-create时候没有region时创建zone失败
 2018-08-05 08:08:46 +08:00
Qiu Jian e07968a1ea 修正：zone-create时候没有region时创建zone失败 2018-08-04 18:31:36 +08:00
邱剑 27cde813dd Merge pull request #10 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-dep-upgrade-pk-sqlchemy to release/2.1.0 
* commit '6d8b27d5e6b5d3f77f160b0e33da7036c3edc800':
  1. 更新sqlchemy & pkg；更新Gopkg.toml && Gopkg.lock 2. 增加make dep, make dep_install, make dep_clean三个Make
 2018-08-04 16:02:42 +08:00
邱剑 b2754f0e67 Merge pull request #9 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-host-enable-disable-netif-cmd to release/2.0.0 
* commit '27d4fab976906e68010503de30452ebfb95783f8':
  增加host-enable-netif和host-disable-netif两个接口
 2018-08-04 15:01:18 +08:00
邱剑 b92c88ad6b Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b2754f0e6744e2ea6acdd61d1383e1986cd5ed85':
  增加host-enable-netif和host-disable-netif两个接口
 2018-08-04 15:01:18 +08:00
Qiu Jian 6d8b27d5e6 1. 更新sqlchemy & pkg；更新Gopkg.toml && Gopkg.lock 
2. 增加make dep, make dep_install, make dep_clean三个Make
 2018-08-03 23:16:54 +08:00
Qiu Jian 27d4fab976 增加host-enable-netif和host-disable-netif两个接口 2018-08-03 22:30:32 +08:00
屈轩 896ea27aca 解决合并冲突 2018-08-03 16:03:49 +08:00
李泽玺 266afc534d Merge pull request #8 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-build-cap-export to release/2.0.0 
* commit 'ecb625ca3b8597b888068fa3d8b4cd2a7f6a409b':
  build: make it more flexible for use in other repo
 2018-08-02 17:12:51 +08:00
李泽玺 007ebd8e9f Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '266afc534dbb0b3658cd56714feeb7911f4ae13e':
  build: make it more flexible for use in other repo
 2018-08-02 17:12:51 +08:00
Yousong Zhou ecb625ca3b build: make it more flexible for use in other repo 
Allow explicitly specifying VERSION, OWNER, EXTRA_BINS

Dropped out in the migration
 2018-08-02 09:08:23 +00:00
屈轩 1ceac571eb 解决合并冲突 2018-08-02 14:59:40 +08:00
屈轩 397c8a7f90 Merge branch 'release/2.0.0' of ssh://git.yunion.io/yunionio/onecloud into feature/disk 2018-08-02 14:55:54 +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
邱剑 4bbafa8bc7 Merge pull request #5 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-add-rpms-build-dir to release/2.0.0 
* commit 'c02d03b50cd1e046cc7b73af8afcc76a4cff7ad3':
  add rpms required files
 2018-08-01 22:16:51 +08:00
邱剑 d21406d77f Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '4bbafa8bc7b393b072609084c804f09ec63f1ea4':
  add rpms required files
 2018-08-01 22:16:51 +08:00