opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,260 Commits 30 Branches 712 Tags
38da40461d4a1bce81e5113baafc8951207e9f76
Commit Graph
511 Commits
Author SHA1 Message Date
邱剑 2310be389b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '430df17dd3cefe0f25328ce69bf8d8b0d0e95253':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
邱剑 430df17dd3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '07304221c0e4f4fa1f75438d24a8feece7202c9f':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
Qiu Jian 78faed91a4 fix: SyncOnce should invalidate policy cache 2019-03-21 11:29:30 +08:00
Qiu Jian 9d966e9959 minor updates 2019-03-21 01:06:33 +08:00
Qiu Jian 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
Zexi Li 1ed92bd176 fix: gpu server not work 2019-03-20 20:07:43 +08:00
邱剑 648875e7b7 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4213db3eb605217796850dd42a266dd0372a7e85':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
邱剑 e211643333 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '648875e7b7319dcb9e9a4d1ee6c65fe83a071c05':
  fix: make virtual interface pointer more general
  fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent
 2019-03-20 15:10:41 +08:00
Zexi Li 076ad985cc move consts to apis 2019-03-20 12:08:15 +08:00
Zexi Li 6df6880501 define scheduler apis output and input structs 2019-03-20 12:03:29 +08:00
Qiu Jian 2c022cd0ef fix: make virtual interface pointer more general 2019-03-19 20:18:48 +08:00
邱剑 116067b02a Merge pull request #1223 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-tag to release/2.8.0 
* commit '43daa1ceb420d8b6176e92ee7c023d51c9c8e962':
  用户自定义标签加前缀user:
  同步公有云key加上前缀
  限制key必须是中英文、数字或者_
  允许只传key进行过滤
  取消key以_开头key限制
  metadata返回列表使用复数
  支持server disk 过滤
  支持标签
 2019-03-19 15:59:46 +08:00
Qiu Jian 090984f9d2 fix: 1. abstract baseagent, 2. extend baseagent to baremetalagent 2019-03-19 12:28:21 +08:00
屈轩 43daa1ceb4 用户自定义标签加前缀user: 2019-03-19 11:26:33 +08:00
邱剑 ef058a61f1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '65a8a7bd82a30cd51b3ca17e6100bae75ea76393':
  默认创建的project_src为local
 2019-03-18 20:55:32 +08:00
屈轩 4b6ddfc3cf 默认创建的project_src为local 2019-03-18 20:13:53 +08:00
wanyaoqi 53ece34f3b merge const pkg from cloudcommon to compute 2019-03-17 11:21:17 +08:00
屈轩 ee62f5d153 限制key必须是中英文、数字或者_ 2019-03-15 14:06:04 +08:00
wanyaoqi e0ee2b8c59 fix package dependence 2019-03-15 11:45:56 +08:00
Qiu Jian a9bbdddc15 fix: qcloud startVM do not retry implicitly 2019-03-14 16:51:34 +08:00
Qiu Jian bc50179bbe Merge branch 'hotfix/qj-resolve-conflict-20190314-2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 16:21:39 +08:00
屈轩 5d5cd9833b 允许只传key进行过滤 2019-03-14 15:43:46 +08:00
屈轩 46d5120a35 取消key以_开头key限制 2019-03-14 15:43:45 +08:00
屈轩 9bcaf1ec84 metadata返回列表使用复数 2019-03-14 15:43:45 +08:00
屈轩 2d0cc14835 支持server disk 过滤 2019-03-14 15:43:21 +08:00
屈轩 703ce13f67 支持标签 2019-03-14 15:42:46 +08:00
Yousong Zhou 4e3925be5b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-update-diffs-270 2019-03-14 07:39:01 +00:00
Qiu Jian 6e8e415235 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 12:11:54 +08:00
Qiu Jian e74f31b7c0 fix: cleanup project sync codes 2019-03-14 09:46:29 +08:00
Yousong Zhou 098d62bdc5 treewide: 改进opslog记录update diff 
action为ACT_UPDATE，仅当len(UpdateDiffs) > 0时才记录
 2019-03-13 14:20:54 +00:00
Yousong Zhou 4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00
Yousong Zhou 8fe4f2ec98 treewide: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 10:46:12 +00:00
Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 
Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go
 2019-03-13 16:32:18 +08:00
邱剑 9448fde22d Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0 
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:28:32 +08:00
周有松 3abb73a9b0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f0f6172156f0c693117ee6dc77c9c54bc4f942ba':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
 2019-03-12 16:47:25 +08:00
Qiu Jian f7c61a9750 fix: 1. usage hide system servers 2. host undo convert shows wrong 
status
 2019-03-12 13:39:22 +08:00
Yousong Zhou c6e4fff0d0 lb: 不记录来自lbagent的GET查询请求 
要求

 - _orig=lbagent
 - userCred.HasSystemAdminPrivilege()
 2019-03-12 03:39:20 +00:00
Yousong Zhou 07f98779ad treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g 2019-03-12 03:39:20 +00:00
Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 
Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go
 2019-03-11 15:03:25 +08:00
Qiu Jian 53435a2528 feature: nic binding support 2019-03-11 04:43:12 +08:00
Zexi Li c94ec06dc2 Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309 2019-03-09 14:02:36 +08:00
万垚奇 1649454d3f Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'eb825342799c2b4a43a822cba84b0906887cd35f':
  修复: joint 的对象创建时没有检验是否存在，会被重复添加
 2019-03-08 21:26:05 +08:00
Zexi Li 57a2a475ef 修复: joint 的对象创建时没有检验是否存在，会被重复添加 2019-03-08 19:08:35 +08:00
屈轩 8a117aac75 更新成功后才添加日志记录 2019-03-07 17:22:01 +08:00
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
Qiu Jian 8eb4a74c8b Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-06 01:39:17 +08:00
Qiu Jian cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
wanyaoqi 46e85d5249 kvm guest support hotplug cpu mem, fix hmp monitor 2019-03-05 14:29:12 +08:00
邱剑 fb5adf56c0 Merge pull request #1156 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-external-project to release/2.7.0 
* commit '0ce6b70998e5646b7f1a1f0f610b003132fab980':
  更改ProjectSource -> ProjectSrc
  同步openstack项目
  同步azure项目
  腾讯云加入debug信息
  external_project去掉cloudregion属性
  补充其他资源项目同步
  映射表默认指向provider的project
  init
 2019-03-05 12:12:54 +08:00