opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-03 21:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,175 Commits 30 Branches 714 Tags
aae3f2fc205bace92dee1bfdf16b85ca254423ac
Commit Graph
265 Commits
Author SHA1 Message Date
周有松 65430a7d49 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '4d727c434842aaee2efdde7d6370dfc53ea70c72':
  appsrv: remove debug code
  appsrv: use copy() for copying slice
  appsrv: rewrite TestRadixMatchParams()
  appsrv: fix TestWorkerManagerError()
  appsrv: fix fmt verb
  appsrv: use RWMutex for rootLock
  cronman: 改正app context key appname拼写
 2018-12-20 10:28:30 +08:00
Yousong Zhou 537a590d69 cronman: 改正app context key appname拼写 2018-12-19 13:15:59 +00:00
屈轩 fcdf62a4d6 支持同步公有云负载均衡信息同步 2018-12-15 13:58:18 +08:00
Qiu Jian 739ef05c86 minor fixes 2018-12-14 00:00:56 +08:00
Qiu Jian e18302866b 1. GetShortDesc()改为GetShortDesc(ctx context.Context) 
2.
VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
 2018-12-13 23:55:51 +08:00
邱剑 f26634c6ee Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '516c39a6144b5558505fa6669d70a8cf4ad3b496':
  loadbalancers: 使用ApplyModelFilters()
  validators: 添加ApplyModelFilters()
  loadbalancerlisteners: 改正update enable_http2
  lbagent: 仅处理manager_id为空的API对象
  gofmt
 2018-12-12 21:14:07 +08:00
Yousong Zhou 35384160ce validators: 添加ApplyModelFilters() 2018-12-12 08:50:57 +00:00
Qiu Jian c33fb7e283 updates 2018-12-10 20:05:20 +08:00
Qiu Jian dd15c8fdbe minor fixes 2018-12-10 20:03:06 +08:00
Qiu Jian fc925e38ce Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-policy-cache 2018-12-10 15:36:18 +08:00
Qiu Jian da1efdaabf 增加policy缓存，降低日志量和计算量 2018-12-10 15:35:15 +08:00
Qiu Jian cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
Qiu Jian 75701657d0 fix bugs 2018-12-07 21:18:52 +08:00
Qiu Jian 1f5ab8750f add task locks 2018-12-07 09:24:12 +08:00
Qiu Jian 965e84ea36 update 2018-12-07 02:57:58 +08:00
邱剑 7c4dc384cc Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '72bad82f1706c85787b24e3750a776c70b68d8d0':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 90f7684910 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7c4dc384ccf856fe1583e8677a2df8496b2057de':
  避免未能及时释放usage quota
 2018-12-06 22:35:31 +08:00
邱剑 72bad82f17 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9e7e48550688c61f414f8e62e8d3dc19d267fa61':
  避免未能及时释放usage quota
 2018-12-06 22:35:30 +08:00
屈轩 fbb12d1216 避免未能及时释放usage quota 2018-12-06 22:30:10 +08:00
Yousong Zhou 9fc85e4df6 standalone: 将ExternalId设置为list:"user" 
ExternalId已经可以通过接口从别处获取，不必再限制为admin only
 2018-12-06 07:51:12 +00:00
Qiu Jian dfb2e0e00c Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 18:09:11 +08:00
Qiu Jian 669081f7f3 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 01:14:45 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
Qiu Jian 7c84cd51e3 改进：cronJob增加 startRun 的开关，如果true，则程序一启动就运行一次job。 2018-12-04 23:33:03 +08:00
邱剑 293a43ee27 Merge pull request #653 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit '5dceb2685ca3a3c078f303ad8328c90ca43d6c8b':
  region: fix host enable not clean sched cache
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
  region: baremetal api compatible
 2018-12-04 20:44:43 +08:00
Zexi Li 5dceb2685c region: fix host enable not clean sched cache 2018-12-04 18:52:17 +08:00
李泽玺 3f3f1701c2 Merge pull request #1 in ~LIZEXI/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-BaremetalSyncAllGuestsStatusTask to bugfix/lzx-baremetal-api 
* commit 'ea81fa26dbcb56eefe131387b2fab8c3b731029d':
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
 2018-12-04 18:09:07 +08:00
Yousong Zhou 5a092d203c db_dispatcher: 移除对listFields的调试日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 273f26848b cloudcommon: models: 注册modelMan时检查crud tag值 2018-12-03 13:44:46 +00:00
Yousong Zhou 801eabbe83 policy: 同步时日志调整 2018-12-03 13:44:45 +00:00
Zexi Li 1b3d33986b region: baremetal api compatible 2018-12-03 20:04:30 +08:00
Zexi Li 22050bca71 region: baremetal api compatible 2018-12-03 18:51:06 +08:00
Qiu Jian b3d8936a80 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203-1 
Conflicts:
	Gopkg.lock
 2018-12-03 15:08:03 +08:00
Qiu Jian c292a1e311 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203 
Conflicts:
	pkg/compute/models/storages.go
 2018-12-03 07:18:27 +08:00
Qiu Jian 94fcb7a400 修正：SPolicyCredential导致task失败 2018-12-03 07:14:43 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
TangBin a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
Qiu Jian e42f1a7744 recode 2018-12-01 12:05:41 +08:00
Qiu Jian b4fcb63b64 Remove SInfrastructureManager & SInfrasture 2018-12-01 01:05:13 +08:00
Qiu Jian 334f3605ba minor fixes 2018-12-01 00:42:29 +08:00
Qiu Jian bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
邱剑 5d3006c971 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b4150df337286fbfa40597d7247a8e9b594f152c':
  修正rbac，非管理模式下权限有deny, owner, user, guest四个级别，管理模式下，有deny, allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-30 13:56:01 +08:00
Qiu Jian 2f22ebe0a8 修正rbac，非管理模式下权限有deny, owner, user, 
guest四个级别，管理模式下，有deny,
allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-29 23:13:53 +08:00
Yousong Zhou 49382934e5 treewide: 保留httperrors的格式 2018-11-28 07:33:22 +00:00
Yousong Zhou 151da754d3 dispatchers: 使用httperrors.NewResourceNotFoundError2() 2018-11-28 07:26:15 +00:00
邱剑 091adfee46 Merge pull request #567 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-esxi-support-complete to release/2.4.0 
* commit 'aaaba6002fb2773d7e05f2353abad494addb3c18':
  fix aliyun fail to attach disk after create disk
  minor fixes
  update vendor
  fix aliyun error code handling changes, use error message string to check message type
  修正：1. host request double token 2. cloud provider lost access url
  backport remove sysutils
  update vendor
  remote sysutils
  esxi support
  temp commit
 2018-11-27 18:07:52 +08:00
邱剑 4b526fb9ab Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd3d1c78a8d4b3d5262907a81e960d6cb645fe7ac':
  增加 quotas 和 usages 的缺省权限
 2018-11-27 15:10:36 +08:00
Qiu Jian 16f06ff081 增加 quotas 和 usages 的缺省权限 2018-11-27 15:04:18 +08:00
Qiu Jian a964836953 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-esxi-support-complete 2018-11-26 15:04:27 +08:00
邱剑 00e001d981 Merge pull request #471 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/guest-disks-backup to release/2.4.0 
* commit 'e64b71818b9f32f49ece1accce7adf011d12a4e1':
  region: support create backup guest; scheduler: support backup guest schedule
 2018-11-26 13:45:08 +08:00