opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 15:01:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
1011 Commits
Author SHA1 Message Date
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
邱剑 fa50e68031 Merge pull request #150 in YUNIONIO/onecloud from feature/rex-logclient-20180822-1018 to release/2.1.0 
* commit '4249e2486a04bd080218b59fc12ffe1f416ad6fa':
  阿里云服务器同步、全量同步操作日志。
  阿里云解绑
  rm log
  日志接口重构；阿里云修改密码、变更配置加日志
  阿里云变更配置增加日志
  更改项目
  接口重构，与OpsLog.LogEvent 保持一致
  阿里云重装系统、开机关机、同步状态日志
  阿里云虚机删除日志
  阿里云创建虚机失败时记录 actionlog
  增加logclient; aliyun server crud 操作
  增加logclient
 2018-09-03 21:13:41 +08:00
屈轩 4f024ad282 添加同步log信息 2018-09-03 10:53:19 +08:00
李泽玺 c43c79c178 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b8bbd34001d2248eca3ceced5428900c9ddd0fd1':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
 2018-09-01 10:57:09 +08:00
李泽玺 b8bbd34001 Merge pull request #145 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.0.0 
* commit '0094a5cffc925796cc7ef1095f0c12592054c30e':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
 2018-09-01 10:57:07 +08:00
Yousong Zhou c559bcd933 resourcebase: updated_at: set list:"user" 2018-08-31 11:07:13 +00:00
Zhang Dongliang adfb5ae364 日志接口重构；阿里云修改密码、变更配置加日志 2018-08-31 09:39:11 +08:00
邱剑 4ed958cf84 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '2dd13257361edec640f0bdb9d4616a37df7cd211':
  cloudcommon: add validator helpers
 2018-08-31 01:24:08 +08:00
Yousong Zhou 7ad2624a7c cloudcommon: add validator helpers 2018-08-30 07:47:08 +00:00
wanyaoqi e2d4054367 extend joint filter 2018-08-29 17:55:13 +08:00
Zhang Dongliang 5a1bb8dd97 merge release/2.1.0 2018-08-29 15:52:53 +08:00
Zhang Dongliang 3b8562a22c 更改项目 2018-08-29 15:43:59 +08:00
wanyaoqi 1e5a231e06 make dep and fix words releated->related 2018-08-28 13:39:54 +08:00
Zhang Dongliang eb135f71dc 接口重构，与OpsLog.LogEvent 保持一致 2018-08-27 18:00:13 +08:00
wanyaoqi d1607e7be6 support joint filter 2018-08-25 18:58:24 +08:00
TangBin 8167aa0c85 fix Conflict 2018-08-25 18:07:54 +08:00
Qiu Jian f339a0b3b5 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into bugfix/qj-resolve-conflict-2.1.0-20180825 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
	pkg/compute/models/disks.go
	pkg/compute/tasks/guest_delete_task.go
 2018-08-25 17:03:06 +08:00
邱剑 bf06700ee2 Merge pull request #111 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-aliyun-vm-auto-start-fail to release/2.0.0 
* commit '122c1d63f298da1dd8800a29e3e83d48b946e021':
  bugfixs for aliyun server create/delete
  remove some debug log
  修正：阿里云主机创建后自动启动失败
 2018-08-25 16:04:25 +08:00
Qiu Jian 122c1d63f2 bugfixs for aliyun server create/delete 2018-08-25 16:02:26 +08:00
邱剑 d9ac8f61d2 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '9be6d86e292c036c783190ac53e929717b46806d':
  fix: NotifyParentTaskFailure reason
 2018-08-25 14:40:02 +08:00
Zexi Li 2914e880af fix: NotifyParentTaskFailure reason 2018-08-25 14:31:05 +08:00
Qiu Jian 4f24cbe615 remove some debug log 2018-08-25 13:07:25 +08:00
邱剑 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