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
174 Commits 27 Branches 687 Tags
c905dfd38898e326ee62bf7a1a638c00bb147167
Commit Graph
79 Commits
Author SHA1 Message Date
邱剑 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
屈轩 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
邱剑 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