opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
ningyu fdf47a1528 refactor: 修改cloudwatcher的服务名称 2018-12-25 17:43:36 +08:00
邱剑 65c9901ec6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '365be98ef5afa2fe14a0125ff1415b9bf683af0c':
  Avoid empty policy rules
 2018-12-25 16:34:16 +08:00
Qiu Jian d008d47f52 Avoid empty policy rules 2018-12-25 16:31:07 +08:00
邱剑 e81a0fd784 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f60937d42ac948a4b1b16e990c8d598c9b05da1b':
  关机后断开webconsole连接
 2018-12-25 15:42:20 +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
邱剑 9c7c585487 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'bdd21beaee9f82bea3db67b93ef95bfaaec445fb':
  cloudprovider增加account的属性
 2018-12-25 15:41:56 +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
邱剑 83a529f234 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f10b31c0bdee8e6d1f2d4cfa5457d83cc0256f82':
  client session add context
 2018-12-25 15:25:52 +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
邱剑 1a633c2e09 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ef3af0b6faf3afb36d2cac9f1a8c866a4fb3db4b':
  golang没有实现baremetal=true|false的过滤条件
 2018-12-25 15:19:07 +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
邱剑 552f100fd8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7d693d7f33ca9a72cf679e33150879234e210e20':
  允许删除阿里云过期包年包月主机
  修正： 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
邱剑 fd9861c4a4 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '53a03de0e9df3cbc762b6d4d26861f37ca9ce4b4':
  修正：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
张东亮 6e709d87dc Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '2bf3cac597363d85b352da0bd1f3a5ba29836861':
  make fmt
 2018-12-24 19:42:12 +08:00
张东亮 a49892b96d Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'aec8cedbf25f649fc66eb3b10079c824327e78be':
  make fmt
 2018-12-24 19:40:47 +08:00
张东亮 aec8cedbf2 Merge pull request #831 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit '5e4f1e54c327adb8354203984f64b96945ed94a9':
  make fmt
 2018-12-24 19:40:47 +08:00
Zhang Dongliang 2fd89c4ae6 make fmt 2018-12-24 19:36:31 +08:00
TangBin 5e4f1e54c3 make fmt 2018-12-24 19:25:08 +08:00
邱剑 d4fec00ec8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f034ce6629e909fa34be8c00e5073bdff84f5515':
  import image bucket exists error fix
 2018-12-24 18:22:13 +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
邱剑 7a680f85ca Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5e48aba74bff1382591e853cd85d16c437d0a763':
  删除腾讯云使用过的对象存储镜像文件
 2018-12-24 18:21:42 +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
邱剑 6a6c5dc5de Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e19dbfc4bf3e19532b4e18a8dbf5c1deb86bc91b':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 16:12:13 +08:00
屈轩 6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑 ae56b3d72a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9e01cafeaec39f59011d227e3406181b26a3c38d':
  fix insert iso
 2018-12-24 15:57:37 +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
邱剑 9b6ec1285b Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '5b562dcb0a07116a5f2d32d0ebddf3f0d02a779e':
  treewide: 重新组织cloudcommon options
  cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY
  appsrv: FetchStruct(): 使用jsonutils
 2018-12-24 12:54:24 +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
邱剑 ca8a677aab Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'cf51c8ff9d092efff8c3d8009f22fb6cb739cc3f':
  add ping detect
 2018-12-22 18:27:56 +08: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
李泽玺 e9c262c8a6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f15e49c6a1ff347eea63fe7a93d95722dd01261':
  climc: k8s app support create pvc
 2018-12-22 18:14:31 +08:00