opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,116 Commits 27 Branches 687 Tags
3aabce87c74f09f247dc99caa78cdc11f4e90abf
Commit Graph
3116 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 3aabce87c7 Merge pull request #842 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cloud-region-zone-add-usable-vpc-filter to release/2.4.0 
* commit '3354b4eee55983c6d68e7823aaecc582eb19011c':
  cloud-region和zone增加usable-vpc=true的过滤器，过滤出有Avaiable VPC的cloudregion和zone
 2018-12-25 21:00:22 +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
邱剑 53cbf050e4 Merge pull request #840 in YUNIONIO/onecloud from ~NINGYU/onecloud:bugfix/ningyu-change-service-name to release/2.4.0 
* commit 'fdf47a1528cddd8d4611cde5b6e7fc598cf7a235':
  refactor: 修改cloudwatcher的服务名称
 2018-12-25 17:54:06 +08:00
ningyu fdf47a1528 refactor: 修改cloudwatcher的服务名称 2018-12-25 17:43:36 +08:00
邱剑 365be98ef5 Merge pull request #839 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-avoid-empty-policy-rules to release/2.4.0 
* commit 'd008d47f52e5a603f940740066e550322d554859':
  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
邱剑 f60937d42a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '10b6e55453338bc282f7c3979f6d176e5c38c93e':
  关机后断开webconsole连接
 2018-12-25 15:42:20 +08:00
邱剑 10b6e55453 Merge pull request #835 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-disconnect to release/2.3.0 
* commit '5f9cc3296a4522775cecb78a1d775da0c1927c68':
  关机后断开webconsole连接
 2018-12-25 15:42:19 +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
邱剑 ef3af0b6fa Merge pull request #837 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-baremetal-filter to release/2.4.0 
* commit '9c265fe2fc6a199c41d35c97959ae994fc8084a0':
  golang没有实现baremetal=true|false的过滤条件
 2018-12-25 15:19:06 +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
邱剑 92963d72aa Merge pull request #836 in YUNIONIO/onecloud from hotfix/rex-dep-ensure to release/2.4.0 
* commit '0d783ae0276c5ad8b76fcc65c56c08bf9622b180':
  dep ensure ++
 2018-12-25 10:26:40 +08:00
Zhang Dongliang 0d783ae027 dep ensure ++ 2018-12-25 10:26:11 +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
张东亮 2bf3cac597 Merge pull request #832 in YUNIONIO/onecloud from hotfix/rex-mkfmt to release/2.4.0 
* commit '2fd89c4ae6ac702b31c5408841f9e4ebac44c134':
  make fmt
 2018-12-24 19:42:12 +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
邱剑 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
邱剑 e19dbfc4bf Merge pull request #827 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgorup-calc-guest-count to release/2.4.0 
* commit '6950eff7792701306edb71d034ea2fea98f241e1':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 16:12:13 +08:00
屈轩 6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑 9e01cafeae Merge pull request #824 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-insert-iso-task to release/2.4.0 
* commit '5d68e62537e8005abf315f16ed766fdf46f9357a':
  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
邱剑 38a8bfa558 Merge pull request #825 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-count-for-secgroup to release/2.2.0 
* commit '5a590cffab7c983fd7c2f161ff9d23dcfb70d684':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:26 +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
邱剑 5b562dcb0a Merge pull request #822 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-options to release/2.4.0 
* commit '603e1be98c293ce1e378c16947d720758d768803':
  treewide: 重新组织cloudcommon options
  cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY
  appsrv: FetchStruct(): 使用jsonutils
 2018-12-24 12:54:23 +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