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
邱剑 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
Qiu Jian a3e802d803 recode quota and usage for image service 2018-12-27 23:59:31 +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 cbcd9f5dc1 make image protected show in list 2018-12-27 18:48:47 +08:00
Qiu Jian 330dade325 1. 增加EnableTorrentService选项 2. 增加PerformMarkPublicProtected接口 2018-12-27 18:24:04 +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
邱剑 220a44b92d Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'd3022fced81f09d655a1493018e315a405536076':
  gofmt
 2018-12-27 11:16:58 +08:00
Rex Zhang 873acd9801 gofmt 2018-12-27 11:15:57 +08:00
Qiu Jian a99ded14e3 minor fixes 2018-12-27 00:07:15 +08:00
Qiu Jian cd3f46871a minor fixes 2018-12-27 00:05:57 +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 102a8d2d12 temp commit 2018-12-26 22:59:59 +08:00
Qiu Jian 7d8cb846f9 move version, qemutil, qemuimg from cloudcommon to util 2018-12-26 22:59:59 +08:00
Qiu Jian b2f4c667eb fix bugs 2018-12-26 22:59:59 +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
李泽玺 ed13debd72 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'eeabe3c0f15f2ee71ab29ba5dc70513903f8f283':
  feature: 查看容器日志支持 --since
 2018-12-26 21:19:42 +08:00
李泽玺 eeabe3c0f1 Merge pull request #848 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-log-support-since to release/2.4.0 
* commit '36e8bedd08ca2df504af29df608dbdfff2a25f44':
  feature: 查看容器日志支持 --since
 2018-12-26 21:19:42 +08:00
邱剑 7bc741d973 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '32095aa1e7385930598c9dfbc0aeb54c39839b40':
  修正：rbac每次获取policy失败后，会time.After两次回调
 2018-12-26 21:14:10 +08:00
Qiu Jian f489e67af6 修正：rbac每次获取policy失败后，会time.After两次回调 2018-12-26 18:50:31 +08:00
Zexi Li 36e8bedd08 feature: 查看容器日志支持 --since 2018-12-26 15:46:25 +08:00
TangBin c95045bc22 fix 2018-12-26 15:23:29 +08:00
TangBin dc8086ed90 修复初次同步云账号内存为空的问题 2018-12-26 14:42:23 +08:00
邱剑 da088e5999 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'fed631c9d6e296941a54fa4113fda2b8428718e9':
  在2.4把owner_allow的权限表示从allow改回owner
 2018-12-26 11:41:55 +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
邱剑 3b4e9e9790 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7efda942b5035ff4b9da700693c593df519e5012':
  region 修复: 宿主机仪表盘数据缺失
 2018-12-26 11:41:47 +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
李泽玺 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
邱剑 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
邱剑 d591107841 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '0160435badff246450843911e38d971136b2e7fd':
  修正：可以通过SyncOnce方法强制刷新policy缓存
 2018-12-25 20:16:55 +08:00
Qiu Jian 957bc822ac 修正：可以通过SyncOnce方法强制刷新policy缓存 2018-12-25 20:13:31 +08:00
邱剑 276b5a426d Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '53cbf050e48ee4b70a925d964719282b601169f4':
  refactor: 修改cloudwatcher的服务名称
 2018-12-25 17:54:07 +08:00