opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-16 15:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,792 Commits 30 Branches 703 Tags
6ca618d539f2f61fdc8c19236aaba4dca0769683
Commit Graph
189 Commits
Author SHA1 Message Date
邱剑 2f7028e8f7 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '6abf1210ab9a7ec6ee292161e3d2548dd3b44b74':
  修正: task 回调不到 stage tailed 的情况
 2018-08-25 11:58:19 +08:00
Zexi Li 96d52d1061 修正: task 回调不到 stage tailed 的情况 2018-08-25 11:02:03 +08:00
Zhang Dongliang 58edf9daf4 阿里云创建虚机失败时记录 actionlog 2018-08-25 07:53:54 +08:00
Zhang Dongliang 6e5b509f3e 增加logclient; aliyun server crud 操作 2018-08-24 15:34:02 +08:00
TangBin 8feaa3538b 阿里云调整配置等API 2018-08-20 11:02:37 +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
wanyaoqi 231e94fbd8 1.fix corn run task with empyt context 2018-08-15 21:52:24 +08:00
屈轩 7d1d1d1d37 修复check create data 使用keyword而不是keywordplural 2018-08-15 21:40:32 +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
Qiu Jian 575ec7a9b5 fixup cronman/doc.go 2018-08-14 10:30:03 +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
邱剑 a4f252bbb2 Merge pull request #42 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-server-pending-delete-clean to release/2.0.0 
* commit 'f7d815eb641d531eaa5e21d6ff07113d056bdcd4':
  forget to update cronjob lastRun
  修正：增加PendingDeleteCheckSeconds参数，设置多久进行一次扫描
  minor updates
  修正：阿里云主机清理回收站功能
 2018-08-13 12:30:45 +08:00
Qiu Jian f7d815eb64 forget to update cronjob lastRun 2018-08-12 09:11:22 +08:00
邱剑 ed8ccfd158 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e0f42e6e3c3216602403476704e8304c48169a2f':
 2018-08-11 22:25:57 +08:00
Qiu Jian f52557a3f8 修正：阿里云主机清理回收站功能 2018-08-11 22:21:25 +08:00
张东亮 4044ec5d6f Merge pull request #37 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-ldap-delete-fix to release/2.0.0 
* commit '534d3d3d7785900c34abc4e6a3f4a0197986e989':
  use httperrors lib
  return fast
  allow delete ldap
 2018-08-11 21:13:56 +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
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 c39644ba4a cloudcommon: db: rename argument name 2018-08-09 04:32:06 +00: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 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
wanyaoqi bbe38254b9 add region in server details 2018-08-06 19:35:13 +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
Zexi Li b5275a0c29 - mv mcclient to pkg/mcclient 
- vendor update
 2018-08-01 14:13:23 +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 976cc8e640 cloudcommon pkg added. 2018-07-27 19:03:32 +08:00