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
404 Commits 27 Branches 687 Tags
fa50e68031b71bf84643bf16beb2d81cf1bef728
Commit Graph
404 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 1607b9a88a Merge pull request #153 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-disk-delete to release/2.1.0 
* commit '289db3be8eb9fb60690c2bf497fe713dfc3d7ede':
  避免aliyun磁盘循环删除失败
 2018-09-03 20:47:11 +08:00
屈轩 289db3be8e 避免aliyun磁盘循环删除失败 2018-09-03 18:27:17 +08:00
邱剑 449dfa0d7d Merge pull request #148 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sync-server-disk to release/2.1.0 
* commit '4f024ad28223386d0581d3d0a6c1f6038ba8f44e':
  添加同步log信息
 2018-09-03 12:22:16 +08:00
邱剑 dc1d036b0d Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '0351e02a2aa0f070954aff5d9eccc2c51fbdaf30':
  region: 支持 container network
 2018-09-03 12:21:52 +08:00
邱剑 0351e02a2a Merge pull request #149 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-contaienr-network-v2 to release/2.0.0 
* commit '6a5ad9208d0b0e65c9daaaedd3e7df46fcc7bf08':
  region: 支持 container network
 2018-09-03 12:21:52 +08:00
Zexi Li 6a5ad9208d region: 支持 container network 2018-09-03 12:18:53 +08:00
屈轩 4f024ad282 添加同步log信息 2018-09-03 10:53:19 +08:00
邱剑 7af93208dd Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'cb59e27e6aecb290d2c0278d9d9acec1ea55f985':
  只有guest.DisableDelete==true的时候才设置
  调度失败后主机自动允许删除
 2018-09-03 10:07:23 +08:00
邱剑 cb59e27e6a Merge pull request #147 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-delete-after-schedule-fail to release/2.0.0 
* commit '6eee82ab3fca515d58026b9ba548524aa8597326':
  只有guest.DisableDelete==true的时候才设置
  调度失败后主机自动允许删除
 2018-09-03 10:07:23 +08:00
Qiu Jian 6eee82ab3f 只有guest.DisableDelete==true的时候才设置 2018-09-02 19:58:33 +08:00
李泽玺 ca9684b48a Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b452cceb2c7104629bbd048e786aecb3b72f1818':
  修正：region刚启动未获得token时，验证API请求报500错误
 2018-09-01 10:57:31 +08:00
李泽玺 b452cceb2c Merge pull request #146 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-token-verification-internal-error to release/2.0.0 
* commit 'a301ee4243dce93e2508532251cec744c0a95a9b':
  修正：region刚启动未获得token时，验证API请求报500错误
 2018-09-01 10:57:31 +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
Qiu Jian 3356e3b114 调度失败后主机自动允许删除 2018-08-31 22:58:49 +08:00
Yousong Zhou 0094a5cffc mcclient: options: BaseListOptions: make OrderBy a list option 2018-08-31 11:07:20 +00:00
Yousong Zhou c559bcd933 resourcebase: updated_at: set list:"user" 2018-08-31 11:07:13 +00:00
Zhang Dongliang 4249e2486a 阿里云服务器同步、全量同步操作日志。 2018-08-31 18:00:07 +08:00
Zhang Dongliang 2653a0645a 阿里云解绑 2018-08-31 10:02:56 +08:00
Zhang Dongliang 4e070f5c91 rm log 2018-08-31 09:40:51 +08:00
Zhang Dongliang adfb5ae364 日志接口重构；阿里云修改密码、变更配置加日志 2018-08-31 09:39:11 +08:00
Zhang Dongliang c81aafb9bc 阿里云变更配置增加日志 2018-08-31 09:32:46 +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
邱剑 2dd1325736 Merge pull request #136 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-validators to release/2.0.0 
* commit '7ad2624a7cdbdc13adbab2f2334f0848836f9557':
  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
Qiu Jian a301ee4243 修正：region刚启动未获得token时，验证API请求报500错误 2018-08-30 14:44:16 +08:00
周有松 e9dadfa1b9 Merge pull request #141 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-climc-server-reset to release/2.1.0 
* commit 'a1f67a60de4a1419116113db240a00d60a803800':
  options: server-reset: pass is_hard only when set
 2018-08-30 11:49:39 +08:00
Yousong Zhou a1f67a60de options: server-reset: pass is_hard only when set 2018-08-30 03:22:48 +00:00
周有松 6c0b16323a Merge pull request #140 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:release/2.1.0 to release/2.1.0 
* commit '83e017b9bc4df2f4fefb4dbe6f1791cf3a2c9ad4':
  climc: servers: convert to using mcclient/options
  climc: alarmevents: use options for param serialization
  climc: use BaseListOptions from mcclient/options
  mcclient: options: initial version
  dep: -update pkg, structarg, sqlchemy
 2018-08-30 11:10:47 +08:00
Yousong Zhou 83e017b9bc Merge branch 'release/2.0.0' into release/2.1.0 2018-08-30 03:01:08 +00:00
周有松 26525ca13e Merge pull request #134 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-options to release/2.0.0 
* commit '34c2b56ca46ab930329052512d3137f09c62f425':
  climc: servers: convert to using mcclient/options
  climc: alarmevents: use options for param serialization
  climc: use BaseListOptions from mcclient/options
  mcclient: options: initial version
  dep: -update pkg, structarg, sqlchemy
 2018-08-30 10:51:13 +08:00
Yousong Zhou 34c2b56ca4 climc: servers: convert to using mcclient/options 2018-08-30 02:48:35 +00:00
Yousong Zhou f0c706919a climc: alarmevents: use options for param serialization 2018-08-30 02:48:35 +00:00
Yousong Zhou 60c4096359 climc: use BaseListOptions from mcclient/options 2018-08-30 02:48:35 +00:00
Yousong Zhou 5f6fa5be96 mcclient: options: initial version 2018-08-30 02:48:35 +00:00
Yousong Zhou bfdfbe2833 dep: -update pkg, structarg, sqlchemy 2018-08-30 02:48:23 +00:00
周有松 8b12c71e3a Merge pull request #138 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/extend-joint-filter to release/2.1.0 
* commit 'e2d405436754ad070ea4112f79abec87420d5d20':
  extend joint filter
 2018-08-30 10:24:11 +08:00
邱剑 8ca430b137 Merge pull request #132 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/server-disk to release/2.1.0 
* commit '5ad60302560eb5aeb540c1540902c43769e83dc2':
  补全aliyun driver信息
  添加aliyuncli操作
  添加GetDetachDiskStatus内容
  添加公有云云硬盘同步操作
 2018-08-29 18:39:27 +08:00
wanyaoqi e2d4054367 extend joint filter 2018-08-29 17:55:13 +08:00
邱剑 7c19d8e062 Merge pull request #137 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-cli-v2 to release/2.0.0 
* commit '39bba47f71091844843468af4fdec272c66274c8':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
 2018-08-29 16:43:49 +08:00
邱剑 1a02439127 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7c19d8e062abb99dd04e260ffc258bea8effd032':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
 2018-08-29 16:43:49 +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
邱剑 ccaf4f461d Merge pull request #88 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-httperror-add-data-fields to release/2.1.0 
* commit '57c1766568863a3124032ef79ec7196ccba3c6ab':
  errors add variable params
  错误返回新增data字段
 2018-08-29 14:49:42 +08:00
Zexi Li 39bba47f71 vendor: add github.com/hako/durafmt 2018-08-29 14:47:57 +08:00
Zexi Li ef97c07562 Merge branch 'feature/lzx-k8s-cli-v2' of ssh://git.yunion.io/~lizexi/onecloud into feature/lzx-k8s-cli-v2 2018-08-29 14:43:58 +08:00
Zexi Li 19d0afae86 climc: k8s-deployment-create support network 2018-08-29 14:43:53 +08:00
Zexi Li ad7c4ac5ad climc: k8s cluster import and addnodes 2018-08-29 14:43:53 +08:00
Zexi Li a61c37501a climc: k8s resource table print 2018-08-29 14:43:53 +08:00