lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-20 08:32:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,728 Commits 24 Branches 641 Tags
ddc2137a461d6aebdb07e5aa5697b15ce1c8caaa
Commit Graph

58 Commits

Author SHA1 Message Date
屈轩
58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
邱剑
cd61e90012 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f933566da6f033e430fa0a7f69fd169dbc3b8ce':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑
6f933566da Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '379e0ac7bc6f64d0a9679cc4998d0abfd68af156':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
屈轩
ccfc1168e0 删除安全组后先隐藏后删除 2019-02-11 20:10:27 +08:00
屈轩
3b60fa1238 避免前端更改描述字段后刷新没有相关字段 2019-01-15 15:48:23 +08:00
屈轩
bdcbd2a8f4 避免参数ports未生效问题 2019-01-10 20:11:43 +08:00
屈轩
0ac4a7bff4 支持批量添加安全组规则 2019-01-04 12:30:53 +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
屈轩
6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑
8c08a27eb6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '38a8bfa55899247a87b0ac7b55c89ac28877e014':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:27 +08:00
屈轩
5a590cffab 安全组不统计容器、物理机、Vmware数量 2018-12-24 15:17:12 +08:00
邱剑
bdda0a880e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0b9ecf9613b41075cf5993a57b313005315d247c':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:02:36 +08:00
屈轩
833e2161d9 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 15:49:22 +08:00
Qiu Jian
00027c55bb Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181216-2 
Conflicts:
	pkg/compute/models/guest_actions.go
 2018-12-17 00:17:38 +08:00
屈轩
e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
屈轩
251765d4b6 未关联主机的安全组规则可以同步 2018-12-15 13:26:16 +08:00
邱剑
c1fca5e883 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c82e4da35fde0bba71279e66f11ef8128aade241':
  避免同步cache中的安全组
 2018-12-12 21:24:22 +08:00
屈轩
064d082ef2 解决冲突 2018-12-12 21:23:23 +08:00
屈轩
7a3ddc7caf 避免同步cache中的安全组 2018-12-12 17:01:14 +08:00
屈轩
e34e45d008 限制虚机绑定安全组数量 2018-12-05 12:40:47 +08:00
屈轩
2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
邱剑
ed77d515d1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '309a2ca0b459a0466eab0229e8e25a899d888946':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
邱剑
309a2ca0b4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2239592dcbafd7afe6e2786be4e99ba611fd6df4':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
屈轩
0f78dd1ffc 大部分公有云不需要将安全组拆分为单个单个的规则 2018-11-30 20:40:59 +08:00
屈轩
e98957b337 解决冲突 2018-11-26 16:27:32 +08:00
屈轩
5dc063ee40 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-secgroup-sync 2018-11-26 11:10:43 +08:00
屈轩
a07ab4c121 初始化model 2018-11-16 15:05:05 +08:00
屈轩
77128909ae Merge branch 'release/2.3.0' of ssh://git.yunion.io/yunionio/onecloud into bugfix/qx-secgroup-tenant 2018-11-08 11:37:17 +08:00
屈轩
be3e4c6e38 同步安全组规则时携带项目信息 2018-11-08 11:31:17 +08:00
邱剑
0e5c80e35f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1df1be46a8fd98a63360b191dfe21eb3863bd3f1':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00
屈轩
5408a4cfc4 同步安全组规则时携带项目信息 2018-11-08 11:23:55 +08:00
邱剑
33c0bc7c26 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'd746c291c3e2e2e6724313c447fc2893069b0de2':
  修正：保护系统默认创建的default资源，不允许删除
 2018-10-24 12:08:56 +08:00
Qiu Jian
3ac638239b Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20180824-2.2.0 
Conflicts:
	pkg/httperrors/httperrors.go
 2018-10-24 12:07:23 +08:00
Qiu Jian
350f4e4db9 修正：保护系统默认创建的default资源，不允许删除 2018-10-24 12:00:53 +08:00
Qiu Jian
0b17fe3547 增加keystone policy资源，格式化代码 2018-10-20 21:29:52 +08:00
邱剑
28f806819c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a563dc78e3740ddd13b9f39201e0f20820b37e4f':
  显示安全组规则
  fix: climc prompt for macos
 2018-09-30 10:27:31 +08:00
Qiu Jian
127302cb3b Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180930 
Conflicts:
	pkg/compute/models/secgroups.go
 2018-09-30 10:21:22 +08:00
屈轩
8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
屈轩
6e966b90ee bugfix 2018-09-20 20:46:37 +08:00
屈轩
6a54305eb2 resolve conflict 2018-09-20 16:29:20 +08:00
屈轩
c753e36f74 resolve conflict 2018-09-20 16:25:46 +08:00
屈轩
3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
屈轩
03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
TangBin
65880ff857 mcclient error 2018-09-18 14:50:45 +08:00
屈轩
c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
Qiu Jian
9a6eeb30f6 使用inmemory lockman 2018-09-11 13:07:51 +08:00
Qiu Jian
7c795f7975 修正：1. 阿里云主机镜像正确设置Platform后，可以正确初始化密码和蜜钥 
2.
系统启动默认创建default安全组，主机默认安全组设置为default。defalt安全组默认出入都开放
 2018-09-06 15:10:55 +08:00
屈轩
7cb13784c2 更新数据库前refresh资源信息 2018-08-15 15:41:07 +08:00
屈轩
bc73e77e35 更改sync算法 2018-08-14 22:48:11 +08:00
屈轩
2676c4fe07 解决冲突 2018-08-13 16:30:00 +08:00