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,574 Commits 27 Branches 687 Tags
35adcede87d21100a0b331f9ebe72ebddcdfb9f6
Commit Graph
1290 Commits
Author SHA1 Message Date
Qiu Jian 05b4aa815f 修正：serverskus的GetExtraDetails接口更改 2018-12-29 16:48:22 +08:00
wanyaoqi fb41fcb817 fix isolated device update 2018-12-29 16:39:41 +08:00
邱剑 dbf25ab342 Merge pull request #850 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-glance-golang to release/2.5.0 
* commit '8d60bc63c16589a9f5cc7197b2a857eac22ed650':
  update vendor
  minor fixes
  minor improvements
  recode quota and usage for image service
  make image protected show in list
  1. 增加EnableTorrentService选项 2. 增加PerformMarkPublicProtected接口
  use separate worker for long running tasks, such as ImageConvertTask, ImageCheckTask, CloudProviderSyncInfoTask
  minor fixes
  minor fixes
  update vendor & make compatible
  update vendor
  final commit
  temp commit
  move version, qemutil, qemuimg from cloudcommon to util
  fix bugs
  update vendor
  add doc.go && make ParseOptions changes
  update fmt & doc
  glance重构 update 1
  temp commit
 2018-12-29 16:32:27 +08:00
邱剑 9eb8e28c27 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '8e1fe97fb1f6253b880af023a9a5653dc4842efc':
  修复: 裸金属服务器分配IP选择错误的网卡
 2018-12-29 15:49:39 +08:00
Zexi Li a9eb4806b2 修复: 裸金属服务器分配IP选择错误的网卡 2018-12-29 14:38:39 +08:00
邱剑 c7545411b9 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '187b153ef9d37b82761ed1895f21e88276cd5c21':
  避免出现多个externalID相同的快照
 2018-12-29 12:49:40 +08:00
邱剑 187b153ef9 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '39f720bec71d4c785500ee5a8b89842a56158f9d':
  避免出现多个externalID相同的快照
 2018-12-29 12:49:40 +08:00
邱剑 39f720bec7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fc0f8abb49fe7ffcecb09e7cde03bbc6736d60c7':
  避免出现多个externalID相同的快照
 2018-12-29 12:49:39 +08:00
屈轩 d6771f56da 避免出现多个externalID相同的快照 2018-12-28 15:22:57 +08:00
邱剑 2a949c635e Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '3d36a450850d441973d027d3c5d3e6d49914a53d':
  fix sql query
  更新sku统计关联主机数量函数名称
  move duplicate code to util func
  bufix & add skus guest count
 2018-12-28 14:40:34 +08:00
邱剑 3d36a45085 Merge pull request #853 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-add-status-column to release/2.4.0 
* commit '896e6dc79e97ebda39b6b596ae0bd975863baeac':
  fix sql query
  更新sku统计关联主机数量函数名称
  move duplicate code to util func
  bufix & add skus guest count
 2018-12-28 14:40:34 +08:00
TangBin 896e6dc79e fix sql query 2018-12-28 10:38:07 +08:00
邱剑 f8de11f7d6 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e862dd9118b17d8770b09672875250572118410c':
  避免获取ipmi密码信息失败时，提示信息不明确
 2018-12-27 21:14:57 +08:00
TangBin 17db0eeb6f 更新sku统计关联主机数量函数名称 2018-12-27 20:02:37 +08:00
TangBin e757fdd592 move duplicate code to util func 2018-12-27 20:00:31 +08:00
TangBin 18e1b58773 bufix & add skus guest count 2018-12-27 19:55:48 +08:00
屈轩 008e881dc5 避免获取ipmi密码信息失败时，提示信息不明确 2018-12-27 18:56:25 +08:00
Qiu Jian df41b7cdcd use separate worker for long running tasks, such as ImageConvertTask, 
ImageCheckTask, CloudProviderSyncInfoTask
 2018-12-27 16:19:24 +08:00
Qiu Jian dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian 21558d3dd2 final commit 
Conflicts:
	pkg/cloudcommon/policy/policy.go
	pkg/util/azure/storagecache.go
 2018-12-26 23:02:19 +08:00
Qiu Jian 88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Qiu Jian f9d9617220 update fmt & doc 2018-12-26 22:52:25 +08:00
Qiu Jian 2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
Qiu Jian c70201b177 temp commit 
Conflicts:
	Gopkg.lock
	Gopkg.toml
	vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go
	vendor/yunion.io/x/structarg/structarg.go
 2018-12-26 22:44:03 +08:00
邱剑 0e447d34bd Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e224af5ed5569d9dcd73e7be4912b71a8dfef745':
  fix
  修复初次同步云账号内存为空的问题
 2018-12-26 22:05:15 +08:00
邱剑 e224af5ed5 Merge pull request #847 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-add-status-column to release/2.4.0 
* commit 'c95045bc229a5761a627742c8408cda4db2e84eb':
  fix
  修复初次同步云账号内存为空的问题
 2018-12-26 22:05:14 +08:00
TangBin c95045bc22 fix 2018-12-26 15:23:29 +08:00
TangBin dc8086ed90 修复初次同步云账号内存为空的问题 2018-12-26 14:42:23 +08:00
邱剑 3b4e9e9790 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7efda942b5035ff4b9da700693c593df519e5012':
  region 修复: 宿主机仪表盘数据缺失
 2018-12-26 11:41:47 +08:00
Zexi Li d854031021 region 修复: 宿主机仪表盘数据缺失 2018-12-26 11:28:14 +08:00
李泽玺 08a78c841f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'bebde40ad0d7a63109967ebdf2ea4820614e6f4c':
  region: volume disk type
 2018-12-26 00:07:50 +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
邱剑 5387276cf7 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '060c7789cfe363b47f9db3c86689b36934e51b37':
  fix create form cdrom os type
 2018-12-25 23:05:23 +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
邱剑 c58cdeec95 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '3aabce87c74f09f247dc99caa78cdc11f4e90abf':
  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
邱剑 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