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
TangBin b34cb29444 aws security group add tags 2018-12-04 12:02:58 +08:00
TangBin 70f0f743ed aws security group fix 2018-12-04 11:52:04 +08:00
屈轩 3fdc72b164 解决冲突 2018-12-04 11:42:06 +08:00
邱剑 e0fe689607 Merge pull request #645 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloudcli-eip-cli to release/2.3.0 
* commit '3518527ef3a1a70cdc53c34cb29d08cb2d93d30b':
  修复qcloudcli eip命令参数缺失
 2018-12-04 11:03:52 +08:00
邱剑 fa8d274c43 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '59d210f5a725897702c68627e8efeaeabe166b53':
  修复: qcloud卸载磁盘API
 2018-12-04 09:47:07 +08:00
屈轩 307c08f2a0 修复: qcloud卸载磁盘API 2018-12-03 22:26:49 +08:00
屈轩 3518527ef3 修复qcloudcli eip命令参数缺失 2018-12-03 22:01:18 +08:00
Yousong Zhou bae1eeaa58 pkg/{aws,azure,qcloud}: fix compilation 2018-12-03 13:47:38 +00:00
Yousong Zhou 3386c0f59e appsrv: workers: 移除调试用日志 2018-12-03 13:44:46 +00: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
屈轩 2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
wanyaoqi ea81fa26db fix BaremetalSyncAllGuestsStatusTask 2018-12-03 20:19:20 +08:00
Zexi Li 1b3d33986b region: baremetal api compatible 2018-12-03 20:04:30 +08:00
邱剑 c33df15e64 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '8894a6a96ff84d50cdba274d2cee76b874100420':
  创建主机时关联秘钥
  eip同步信息修复
 2018-12-03 19:56:36 +08:00
Zexi Li 22050bca71 region: baremetal api compatible 2018-12-03 18:51:06 +08:00
屈轩 1ff18372b7 创建主机时关联秘钥 2018-12-03 18:31:29 +08:00
屈轩 2ad16ecd4f eip同步信息修复 2018-12-03 18:25:36 +08:00
邱剑 ee0df651ce Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '33ef5a50085f26c79b36210265183300f3aa996c':
  创建主机时未设置安全组信息
 2018-12-03 17:39:17 +08:00
邱剑 33ef5a5008 Merge pull request #642 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-instance-secgroup to release/2.3.0 
* commit '9dfc8a39c96496a8326d5abb7777a90ee3010b3b':
  创建主机时未设置安全组信息
 2018-12-03 17:39:16 +08:00
邱剑 24b210b91e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ddfe759c8b8e3b765fb4dab832eb7818390e0658':
  避免一直创建snapshot
  避免第一次更改完配置失败后直接返回
 2018-12-03 17:39:02 +08:00
Qiu Jian c54c102541 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-03 17:31:40 +08:00
屈轩 9dfc8a39c9 创建主机时未设置安全组信息 2018-12-03 17:22:56 +08:00
屈轩 ffd973d98e 避免一直创建snapshot 2018-12-03 16:54:46 +08:00
屈轩 5597738ecd 避免第一次更改完配置失败后直接返回 2018-12-03 16:34:44 +08:00
邱剑 5be54bad55 Merge pull request #639 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '37578c8a6ddaf8c0f4b6b65a9bad9552aba3b201':
  修复规则缺失优先级及描述信息
 2018-12-03 15:12:43 +08:00
邱剑 37578c8a6d Merge pull request #638 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-rule to release/2.3.0 
* commit '5c6a5c937516575dc5336d672dd083dd7a99f9d7':
  修复规则缺失优先级及描述信息
 2018-12-03 15:08:47 +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
邱剑 a906b1827e Merge pull request #636 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-usercred-policy-fail-task to release/2.3.0 
* commit '9ca04590c35e82070ef2d7636206ce985354119c':
  update vendor
  修正：SPolicyCredential导致task失败
 2018-12-03 14:54:49 +08:00
屈轩 5c6a5c9375 修复规则缺失优先级及描述信息 2018-12-03 12:19:54 +08:00
Qiu Jian fe7d54e6cb fix aws missing init 2018-12-03 07:36:30 +08:00
Qiu Jian de7ca3a589 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/hostdrivers/aliyun.go
	pkg/compute/hostdrivers/aws.go
	pkg/compute/hostdrivers/azure.go
	pkg/compute/hostdrivers/qcloud.go
 2018-12-03 07:34:11 +08:00
邱剑 34f0a20bef Merge pull request #630 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-create-disk to release/2.3.0 
* commit '719a8a1db572243337194fc71c58cc12357ae075':
  检查磁盘扩容大小
  检查公有云磁盘创建限制
 2018-12-03 07:19:38 +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
邱剑 b9a931d015 Merge pull request #634 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/resolve-conflict-20181201 to release/2.4.0 
* commit 'ecc750107b4f25c738ad8f15fa9ab615e9cc36de':
  remove inframanager.go
  recode
  allow zone_id empty for hosts
  Remove SInfrastructureManager & SInfrasture
  minor fixes
  fix userCred.IsSystemAdmin() for set/del extra option
  1. 取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred 2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-12-03 07:13:48 +08:00
Qiu Jian 7aa31407a7 temp commit 2018-12-02 02:11:50 +08:00
wanyaoqi 93100dd305 fix import not use and not enough arguments in call 2018-12-01 16:24:18 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
屈轩 719a8a1db5 检查磁盘扩容大小 2018-12-01 15:50:00 +08:00
邱剑 f30c79d969 Merge pull request #629 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-kvm-sku-support to release/2.4.0 
* commit '8d4266afad4f0174ed88f6586857a070de921a5f':
  bugfix
  skus update
  InstanceTypeCategory chaset
 2018-12-01 15:00:00 +08:00
TangBin a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
邱剑 36435eeb28 Merge pull request #626 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-remove-usercred-issystemadmin to release/2.3.0 
* commit 'a95b396f2407b782d6d76dd02d6387591cb58a47':
  remove inframanager.go
  recode
  allow zone_id empty for hosts
  Remove SInfrastructureManager & SInfrasture
  minor fixes
  fix userCred.IsSystemAdmin() for set/del extra option
  1. 取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred 2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-12-01 14:27:50 +08:00
Qiu Jian 6b19a7a1e8 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181201 
Conflicts:
	pkg/compute/guestdrivers/azure.go
	pkg/compute/guestdrivers/managedvirtual.go
	pkg/compute/guestdrivers/qcloud.go
	pkg/compute/models/guest_actions.go
 2018-12-01 14:19:53 +08:00
屈轩 7b2fed8d85 检查公有云磁盘创建限制 2018-12-01 13:05:02 +08:00
邱剑 d58a7e0915 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4aa4f427b66ea7c985002b31a939a300f1f83ba0':
  避免eip关联主机或解绑失败后，不能再次操作
 2018-12-01 12:54:32 +08:00
邱剑 4a0087d260 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd58a7e091588eea6446b31d5d622ab62b84b567b':
  避免eip关联主机或解绑失败后，不能再次操作
 2018-12-01 12:54:32 +08:00
TangBin 8d4266afad bugfix 2018-12-01 12:52:40 +08:00
TangBin cec80f4a62 skus update 2018-12-01 12:47:21 +08:00