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,339 Commits 27 Branches 687 Tags
df41b7cdcd88f6b4e67eb3cd97bc4a15e43afdcc
Commit Graph
3339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 bfa400cd53 update vendor 2018-12-26 23:31:54 +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 183e901cb4 update vendor 
Conflicts:
	Gopkg.lock
 2018-12-26 22:59:53 +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
邱剑 32095aa1e7 Merge pull request #849 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-retry-duplicate to release/2.4.0 
* commit 'f489e67af6d326ebcc201077e960f7b917211028':
  修正：rbac每次获取policy失败后，会time.After两次回调
 2018-12-26 21:14:09 +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
邱剑 7efda942b5 Merge pull request #845 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-host-details-missing to release/2.4.0 
* commit 'd854031021128e2775e03138c7e29b35d5c4f23f':
  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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
邱剑 f60937d42a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '10b6e55453338bc282f7c3979f6d176e5c38c93e':
  关机后断开webconsole连接
 2018-12-25 15:42:20 +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