lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-30 04:20:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,199 Commits 36 Branches 638 Tags
0d31819208bfcb3fa187f2c48637fcd1485aeab7
Commit Graph

78 Commits

Author SHA1 Message Date
ioito
0d0f9bcb5f 避免频繁连接server 2019-05-28 17:08:19 +08:00
ioito
35ae3694f5 避免ip为空导致创建失败 2019-05-23 12:05:26 +08:00
ioito
ff2cca8611 rebase master 2019-05-21 22:36:52 +08:00
Qiu Jian
2efc5e641e fix: add keystone initialization procedures 2019-05-17 13:54:29 +08:00
屈轩
3be12645b5 webconsole支持指定端口ssh连接 2019-04-17 13:25:22 +08:00
Zexi
db0e303798 make 'go test ./...' pass 2019-04-15 19:54:46 +08:00
Zexi Li
1b30654983 fix: webconsole vmrc protocol not support (#336) 2019-04-11 15:01:09 +08:00
屈轩
15d4374aad openstack不能有protocol参数 (#174) 2019-04-02 17:48:22 +08:00
Qiu Jian
004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
周有松
90598a6a07 Merge pull request #1277 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-ucloud-sync to release/2.8.0 
* commit '5694a7495e160541ef41787c923901cda3589020':
  add ucloud hypervisor
  add ucloud vnc info
  storage fix
  DoListAll func add comment
  network start&end ip fix
  fix ucloud sync comment
  ucloud sync
 2019-03-26 21:09:38 +08:00
TangBin
5694a7495e add ucloud hypervisor 2019-03-26 20:23:03 +08:00
TangBin
a46c8c02cc add ucloud vnc info 2019-03-26 18:46:03 +08:00
Zexi Li
4a9477b9d7 resolve conflict 2019-03-22 15:59:42 +08:00
wanyaoqi
e0ee2b8c59 fix package dependence 2019-03-15 11:45:56 +08: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
邱剑
48852de054 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'c1f3ab0801121164a95743c18b228bccdfc443d1':
  避免多次编码后,qcloud不能解开url编码
 2019-03-04 21:22:09 +08:00
邱剑
c1f3ab0801 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6e5aa39836dbe935294ee58cc4376aa0e0bce21b':
  避免多次编码后,qcloud不能解开url编码
 2019-03-04 21:22:09 +08:00
屈轩
2fa4d761e7 冲突解决 2019-03-04 21:21:14 +08:00
邱剑
66354e8cc4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bc37559720bce37130fda048f3dc36a3d9cb11cb':
  避免多次编码后,qcloud不能解开url编码
 2019-03-04 21:18:17 +08:00
屈轩
798b595dfb 避免多次编码后,qcloud不能解开url编码 2019-03-04 21:12:41 +08:00
李泽玺
73d8cf11d9 Merge pull request #1123 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cluster-api to release/2.7.0 
* commit 'b6fe9b80592be6a080c981c8af32a7ae293c5b84':
  k8s multi cluster api
 2019-02-28 16:20:28 +08:00
Zexi Li
b6fe9b8059 k8s multi cluster api 2019-02-28 16:20:09 +08:00
邱剑
b3ddb964be Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6c6f80488f94083da56d6a60ca1f96d7231f653e':
  识别openstack protocol
 2019-02-21 15:27:09 +08:00
屈轩
f4cf4ab93d 识别openstack protocol 2019-02-21 15:25:01 +08:00
Zexi Li
d41df56a82 webconsole: support websocket proxy 2019-02-19 15:32:07 +08:00
Qiu Jian
f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215 
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
 2019-02-15 19:47:56 +08:00
屈轩
c9756aa6f0 添加参数，允许不直接登录虚拟机 2019-02-15 10:46:57 +08:00
Zexi Li
223c6d95a2 修复: webconsole 连接vnc设置 password 的虚拟机 2019-01-19 17:35:59 +08:00
屈轩
935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
Rex Zhang
873acd9801 gofmt 2018-12-27 11:15:57 +08:00
Qiu Jian
dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +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
Zexi Li
36e8bedd08 feature: 查看容器日志支持 --since 2018-12-26 15:46:25 +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
wanyaoqi
742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
屈轩
5f9cc3296a 关机后断开webconsole连接 2018-12-24 22:12:55 +08:00
Yousong Zhou
603e1be98c treewide: 重新组织cloudcommon options 
将cloudcommon.Options从cloudcommon.DBOptions中拿出来，并改名为CommonOptions
 2018-12-23 15:31:11 +00:00
Qiu Jian
a6b865e7a2 修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 
服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接
3.
app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 17:10:34 +08:00
Qiu Jian
965e84ea36 update 2018-12-07 02:57:58 +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
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
bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
屈轩
45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑
549fbbb6b1 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f9899a6e59c7b3ab1ef9581e7fe4340da22225b1':
  忽略known_hosts影响
 2018-11-30 16:05:02 +08:00
屈轩
7caeab976c 忽略known_hosts影响 2018-11-30 16:04:08 +08:00
邱剑
84ca24fed0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70c2b8255796b292a3fe91788b6dc0486a24aec3':
  忽略known_hosts记录
 2018-11-30 15:48:50 +08:00
邱剑
70c2b82557 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b51cb3a1cf8493cd3085b6268711d4d568d47e15':
  忽略known_hosts记录
 2018-11-30 15:48:50 +08:00
屈轩
0e68f6d486 冲突解决 2018-11-30 15:33:33 +08:00