opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,125 Commits 27 Branches 687 Tags
36e8bedd08ca2df504af29df608dbdfff2a25f44
Commit Graph
2097 Commits
Author SHA1 Message Date
Zexi Li 36e8bedd08 feature: 查看容器日志支持 --since 2018-12-26 15:46:25 +08:00
邱剑 fed631c9d6 Merge pull request #846 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recovery-owner-allow-to-owner to release/2.4.0 
* commit 'c7ac542061005c5a65956562c99e3559955718aa':
  在2.4把owner_allow的权限表示从allow改回owner
 2018-12-26 11:41:55 +08:00
Qiu Jian c7ac542061 在2.4把owner_allow的权限表示从allow改回owner 2018-12-26 11:39:58 +08:00
Zexi Li d854031021 region 修复: 宿主机仪表盘数据缺失 2018-12-26 11:28:14 +08:00
李泽玺 bebde40ad0 Merge pull request #844 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-disk-volume-type to release/2.4.0 
* commit '8683a20ae2ff5ff41bb1567e205f1ed53332788c':
  region: volume disk type
 2018-12-26 00:07:49 +08:00
Zexi Li 8683a20ae2 region: volume disk type 2018-12-25 23:54:45 +08:00
邱剑 060c7789cf Merge pull request #843 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-create-from-cdrom-did-not-set-os-type to release/2.4.0 
* commit 'd0226f973710084b0293824533fd556ac25bd07c':
  fix create form cdrom os type
 2018-12-25 23:05:23 +08:00
wanyaoqi d0226f9737 fix create form cdrom os type 2018-12-25 21:49:26 +08:00
Qiu Jian 3354b4eee5 cloud-region和zone增加usable-vpc=true的过滤器，过滤出有Avaiable 
VPC的cloudregion和zone
 2018-12-25 20:55:34 +08:00
邱剑 0160435bad Merge pull request #841 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-manually-sync-policy to release/2.4.0 
* commit '957bc822acb991b148d6f8a62405a9042e809da4':
  修正：可以通过SyncOnce方法强制刷新policy缓存
 2018-12-25 20:16:55 +08:00
Qiu Jian 957bc822ac 修正：可以通过SyncOnce方法强制刷新policy缓存 2018-12-25 20:13:31 +08:00
ningyu fdf47a1528 refactor: 修改cloudwatcher的服务名称 2018-12-25 17:43:36 +08:00
Qiu Jian d008d47f52 Avoid empty policy rules 2018-12-25 16:31:07 +08:00
邱剑 f60937d42a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '10b6e55453338bc282f7c3979f6d176e5c38c93e':
  关机后断开webconsole连接
 2018-12-25 15:42:20 +08:00
邱剑 bdd21beaee Merge pull request #838 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cloud-provider-account-name to release/2.4.0 
* commit '186e048151c355b170d4fb2fa07c2a1485b00d2c':
  cloudprovider增加account的属性
 2018-12-25 15:41:55 +08:00
Qiu Jian 186e048151 cloudprovider增加account的属性 2018-12-25 15:40:20 +08:00
邱剑 f10b31c0bd Merge pull request #834 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/client-session-add-ctx to release/2.4.0 
* commit '742a67b0f847813c5fa7245514330f44bbef0486':
  client session add context
 2018-12-25 15:25:52 +08:00
Qiu Jian 9c265fe2fc golang没有实现baremetal=true|false的过滤条件 2018-12-25 15:11:11 +08:00
wanyaoqi 742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
邱剑 7d693d7f33 Merge pull request #833 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-20181224 to release/2.4.0 
* commit 'a28981d8064c4ef06bdc1af1c541b93ac0ce556a':
  允许删除阿里云过期包年包月主机
  修正： 1. 阿里云client空指针错误，通过wrapper隐藏 2. clean storage cached image处理异常情况 3. server purge不能purge带eip的主机
 2018-12-24 23:58:39 +08:00
邱剑 53a03de0e9 Merge pull request #823 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-admin-resource-info to release/2.4.0 
* commit 'de2ecb6be7f9a1aff867c2cec09cf10a89f17572':
  修正：policy默认采用json解码，只有climc才采用yaml
  minor updates
  fix admin resource list
  修正：由后端来确定一个资源是否是管理资源（无owner的资源）
 2018-12-24 23:34:31 +08:00
Qiu Jian de2ecb6be7 修正：policy默认采用json解码，只有climc才采用yaml 2018-12-24 23:31:24 +08:00
屈轩 5f9cc3296a 关机后断开webconsole连接 2018-12-24 22:12:55 +08:00
Qiu Jian a28981d806 允许删除阿里云过期包年包月主机 2018-12-24 21:20:14 +08:00
Qiu Jian e1832849de 修正： 1. 阿里云client空指针错误，通过wrapper隐藏 2. clean storage 
cached image处理异常情况 3. server purge不能purge带eip的主机
 2018-12-24 20:13:05 +08:00
Zhang Dongliang 2fd89c4ae6 make fmt 2018-12-24 19:36:31 +08:00
邱剑 f034ce6629 Merge pull request #830 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit '60f829945f12add02da06c44ad6e0bc425d675eb':
  import image bucket exists error fix
 2018-12-24 18:22:12 +08:00
邱剑 5e48aba74b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bac21fd477d7d776dd28556f61ebeee82dbc433f':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:42 +08:00
邱剑 bac21fd477 Merge pull request #829 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-delete-cos-object to release/2.3.0 
* commit '89b81ec34ef5db6ba6f7e042394d240e0f6994ab':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:41 +08:00
屈轩 89b81ec34e 删除腾讯云使用过的对象存储镜像文件 2018-12-24 17:06:13 +08:00
TangBin 60f829945f import image bucket exists error fix 2018-12-24 16:47:38 +08:00
屈轩 6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑 8c08a27eb6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '38a8bfa55899247a87b0ac7b55c89ac28877e014':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:27 +08:00
屈轩 5a590cffab 安全组不统计容器、物理机、Vmware数量 2018-12-24 15:17:12 +08:00
wanyaoqi 5d68e62537 fix insert iso 2018-12-24 14:58:41 +08:00
Qiu Jian 396fda7cf8 minor updates 2018-12-24 12:33:58 +08:00
Qiu Jian d83171906c fix admin resource list 2018-12-24 12:30:40 +08:00
Qiu Jian 7e423bc882 修正：由后端来确定一个资源是否是管理资源（无owner的资源） 2018-12-24 12:16:13 +08:00
Yousong Zhou 603e1be98c treewide: 重新组织cloudcommon options 
将cloudcommon.Options从cloudcommon.DBOptions中拿出来，并改名为CommonOptions
 2018-12-23 15:31:11 +00:00
Yousong Zhou cf639cf6dd cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY 2018-12-23 15:26:50 +00:00
Yousong Zhou ae40f39d32 appsrv: FetchStruct(): 使用jsonutils 2018-12-23 15:26:50 +00:00
邱剑 cf51c8ff9d Merge pull request #821 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/regionv2-add-ping-detect-cornjob to release/2.4.0 
* commit '005061255ef1d57b51c3abaaeda16ab23fdf5ba9':
  add ping detect
 2018-12-22 18:27:55 +08:00
wanyaoqi 005061255e add ping detect 2018-12-22 18:23:19 +08:00
李泽玺 6f15e49c6a Merge pull request #819 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-app-pvc to release/2.4.0 
* commit '294b382c897c1bba83067b448118db243a01a0e3':
  climc: k8s app support create pvc
 2018-12-22 18:14:31 +08:00
邱剑 5226973908 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '51971ebb318a750d1f2cb1fb3522dd57576d9312':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
邱剑 51971ebb31 Merge pull request #818 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-worker-stats to release/2.2.0 
* commit 'e768369181f3f264f551d3e40da7ec89e5cb0a6d':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
邱剑 2eec38953c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '522697390818755e32964021e44bff63e752b8ee':
  修正worker状态信息
 2018-12-22 17:07:59 +08:00
Zexi Li 294b382c89 climc: k8s app support create pvc 2018-12-22 17:07:39 +08:00
屈轩 e768369181 修正worker状态信息 2018-12-22 17:05:37 +08:00
邱剑 55e6c0c1f4 Merge pull request #813 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-policy-test-single to release/2.4.0 
* commit '71a789f70ec19998cf81d87c460e7c10758f1a3e':
  minor fixes
  改进： 1. policy explain增加name参数，允许针对一个policy进行策略测试。2. 将owner，admin统一为allow
 2018-12-22 16:45:58 +08:00