opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,554 Commits 27 Branches 687 Tags
88fdb47fb6a9d386a3df6730e4d1809da04ddb2b
Commit Graph
1554 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zexi Li 88fdb47fb6 resolve confict 2018-11-09 17:18:17 +08:00
邱剑 f98c3275ba Merge pull request #446 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181109-2.3.0 to release/2.3.0 
* commit 'd00dd6c42aa191521031653242cf01d2a4c058b3':
  optimize export list make dep
 2018-11-09 15:39:50 +08:00
周有松 ff4b6ecad9 Merge pull request #441 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '09e511883cf481bf8142ee9ed3f0892fe1418821':
  cloudcommon: validators: return 400 for struct validation failure
  loadbalancers: show loadbalancer name for listener and backend group
  mcclient: loadbalancers: allow updating names
  loadbalancers: more compact backendGroup validation
  lbagent: list with details=true explicitly
  lbagent: fix unused imports
  pkg: httputils: ParseJSONResponse(): rewrite for clearness
  mcclient: base: guard against empty repsonse
  mcclient: options: set details correctly
 2018-11-09 14:11:24 +08:00
Qiu Jian d00dd6c42a Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181109-2.3.0 
Conflicts:
	Gopkg.lock
	pkg/cloudcommon/db/modelbase.go
 2018-11-09 12:37:21 +08:00
邱剑 9f4ff99db8 Merge pull request #415 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/export-list-optimize to release/2.2.0 
* commit '721ac4b9121752ee1f47401f10e2af8ade8af382':
  optimize export list make dep
 2018-11-09 12:21:17 +08:00
wanyaoqi 721ac4b912 optimize export list 
make dep
 2018-11-09 11:55:31 +08:00
Yousong Zhou 09e511883c cloudcommon: validators: return 400 for struct validation failure 2018-11-08 15:54:38 +00:00
Yousong Zhou 73ec3d67fa loadbalancers: show loadbalancer name for listener and backend group 2018-11-08 15:37:48 +00:00
Yousong Zhou 13bc224202 mcclient: loadbalancers: allow updating names 
- loadbalanceracls: allow updating only name
 2018-11-08 15:37:48 +00:00
Yousong Zhou 24172a26f4 loadbalancers: more compact backendGroup validation 2018-11-08 15:37:48 +00:00
Yousong Zhou 9a73d5c095 lbagent: list with details=true explicitly 
Previously we depend on .Params() of mcclient to set it for us.  Set it
explicitly just in case
 2018-11-08 15:37:48 +00:00
Yousong Zhou 7acc86b021 lbagent: fix unused imports 2018-11-08 15:37:48 +00:00
Yousong Zhou 9388748e45 pkg: httputils: ParseJSONResponse(): rewrite for clearness 
Make it more clear that it's possible the function can return with
body==nil and err==nil
 2018-11-08 15:36:24 +00:00
邱剑 0b08b4a3eb Merge pull request #443 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-config-node-docker to release/2.3.0 
* commit '5fae00ed962bd7aabe2f0152ed2ddff4a3d7821c':
  climc: allow config k8s node docker registry
 2018-11-08 20:54:24 +08:00
Zexi Li 5fae00ed96 climc: allow config k8s node docker registry 2018-11-08 20:29:32 +08:00
Yousong Zhou 2e0c9741b1 mcclient: base: guard against empty repsonse 
panic: runtime error: invalid memory address or nil pointer dereference
	[signal SIGSEGV: segmentation violation code=0x1 addr=0x48 pc=0x768977]

	goroutine 1 [running]:
	yunion.io/x/onecloud/pkg/mcclient/modules.(*BaseManager)._list(0x11a8100, 0xc00026b730, 0xc0005ba0e0, 0x69, 0xb794a3, 0x14, 0x69, 0x0, 0x0)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/base.go:118 +0x1d7
	yunion.io/x/onecloud/pkg/mcclient/modules.(*ResourceManager).ListInContexts(0x11a8100, 0xc00026b730, 0xc1cbe0, 0xc00000ef28, 0x0, 0x0, 0x0, 0xc00010ad80, 0xa919c0, 0xc00010ad80)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/resource.go:254 +0x150
	yunion.io/x/onecloud/pkg/mcclient/modules.(*ResourceManager).List(0x11a8100, 0xc00026b730, 0xc1cbe0, 0xc00000ef28, 0x0, 0xc0005a79e0, 0x6)
		/home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/modules/resource.go:239 +0x5a
	yunion.io/x/onecloud/cmd/climc/shell.init.40.func3(0xc00026b730, 0xc00010ad80, 0x0, 0x0)
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/shell/loadbalancerbackends.go:35 +0x7e
	reflect.Value.call(0xa7e6c0, 0xb98170, 0x13, 0xb6b4b8, 0x4, 0xc00059c120, 0x2, 0x2, 0xc000297dc8, 0xc00003c6a0, ...)
		/home/yunion/.usr/go/goroot-1.11.1/src/reflect/value.go:447 +0x449
	reflect.Value.Call(0xa7e6c0, 0xb98170, 0x13, 0xc00059c120, 0x2, 0x2, 0x1, 0x2, 0x18)
		/home/yunion/.usr/go/goroot-1.11.1/src/reflect/value.go:308 +0xa4
	yunion.io/x/onecloud/vendor/yunion.io/x/structarg.(*SubcommandArgument).Invoke(0xc000174620, 0xc0005a7e60, 0x2, 0x2, 0xa67760, 0xc000297db0)
		/home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/structarg/structarg.go:702 +0x1fb
	main.executeSubcommand(0xc000174620, 0xc0000f19d0, 0xc000174540, 0xc000262ab0)
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/climc.go:220 +0xcf
	main.main()
		/home/yunion/go/src/yunion.io/x/onecloud/cmd/climc/climc.go:271 +0x256
 2018-11-08 12:21:51 +00:00
Yousong Zhou 25641f49c9 mcclient: options: set details correctly 
details=false is already the default
 2018-11-08 12:21:51 +00:00
邱剑 8ce134fc7e Merge pull request #438 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenant to release/2.3.0 
* commit '77128909aeeece8cca66c7ff11366897b70ab050':
  同步安全组规则时携带项目信息
 2018-11-08 20:04:07 +08:00
邱剑 4b4dd155c7 Merge pull request #436 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-owner-privilege to release/2.3.0 
* commit '1d0ad17e360de5bf7ac772d4e721985453be9708':
  fix format
  修正：增加owner级别权限，放置普通用户可以访问系统资源
 2018-11-08 19:59:50 +08:00
邱剑 ab6eae05b2 Merge pull request #442 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-server-list-cdrom to release/2.3.0 
* commit '6bf33cfed5a7ed3f8a5547945474b05d0b904f5d':
  region: server-list add cdrom
 2018-11-08 19:52:50 +08:00
Zexi Li 6bf33cfed5 region: server-list add cdrom 2018-11-08 19:21:47 +08:00
邱剑 78b8294a82 Merge pull request #439 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-create-container-no-disk to release/2.3.0 
* commit 'e9095d4b1ba06de34c9e5b4acf3c584d1b2f73bd':
  region: no disks created when create container
 2018-11-08 11:59:16 +08:00
Zexi Li e9095d4b1b region: no disks created when create container 2018-11-08 11:55:13 +08:00
Qiu Jian 1d0ad17e36 fix format 2018-11-08 11:39:48 +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
邱剑 1df1be46a8 Merge pull request #437 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenantid-set to release/2.2.0 
* commit '5408a4cfc41e31eb374994257e0e9c92cb8a4167':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +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
邱剑 cded919ce0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '83299b849b473abaa49881a89ffe61576a6ea779':
  Image添加description字段
 2018-11-08 01:44:23 +08:00
邱剑 83299b849b Merge pull request #435 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-glance-image-description to release/2.2.0 
* commit '3716e88878b3a545d96b5ce8d0936bd48608caa3':
  Image添加description字段
 2018-11-08 01:44:23 +08:00
Qiu Jian 388b793490 修正：增加owner级别权限，放置普通用户可以访问系统资源 2018-11-08 01:36:19 +08:00
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
邱剑 e46ef3a297 Merge pull request #433 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/misco-fix03 to release/2.3.0 
* commit 'fb18edce1b975414ebc22defb43763cab70478d8':
  fix get vnc port error
 2018-11-07 15:39:42 +08:00
wanyaoqi fb18edce1b fix get vnc port error 2018-11-07 10:55:51 +08:00
李泽玺 89cfced307 Merge pull request #432 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-region-container-driver to release/2.3.0 
* commit '917e1ee95435b81deb7a1ea387a16d4cfc8814e4':
  region: container driver
 2018-11-06 21:09:53 +08:00
Zexi Li 917e1ee954 region: container driver 2018-11-06 21:08:59 +08:00
邱剑 223a126793 Merge pull request #429 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-delete-fail to release/2.3.0 
* commit '7208814421e5a1714beb11ee51c377cdff436f66':
  修正：policy删除报错找不到blob
 2018-11-05 18:43:47 +08:00
Qiu Jian 7208814421 修正：policy删除报错找不到blob 2018-11-05 18:33:10 +08:00
邱剑 24509e485f Merge pull request #428 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-role-add-description to release/2.3.0 
* commit 'a497f4dae850df6b8549ecbab7aad8062ed8b145':
  角色增加描述(description)字段
 2018-11-05 18:24:31 +08:00
周有松 8b7388f5ae Merge pull request #423 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit 'afb881229d4369e502b72ff5d9e05c49480109a9':
  loadbalancerlisteners: return 409 on port conflict
 2018-11-05 18:22:40 +08:00
Qiu Jian a497f4dae8 角色增加描述(description)字段 2018-11-05 18:12:47 +08:00
李泽玺 f91760e20d Merge pull request #427 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0 
* commit '2feb414106d138a471c3f31c71998f31287cfbd7':
  climc: add k8s servicetree and notify app
 2018-11-05 17:32:33 +08:00
Zexi Li 2feb414106 climc: add k8s servicetree and notify app 2018-11-05 16:50:13 +08:00
邱剑 79d2df8155 Merge pull request #426 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.3 to release/2.3.0 
* commit '255f5e242ab2f6eb58010d1fb42c7d2940312890':
  lbagent: make sonar happy
 2018-11-05 16:41:26 +08:00
Yousong Zhou 255f5e242a lbagent: make sonar happy 2018-11-05 08:39:50 +00:00
唐斌 b2320988c3 Merge pull request #425 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.2 to release/2.2.0 
* commit '5299fd63c38445a7c42fa42a6983b2b154df2b5d':
  yunionconf: make qunar happy
 2018-11-05 16:34:06 +08:00
唐斌 62a7711002 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b2320988c3916da37ebd491dc5d267f0ba0f5e9a':
  yunionconf: make qunar happy
 2018-11-05 16:34:06 +08:00
Yousong Zhou 5299fd63c3 yunionconf: make qunar happy 2018-11-05 08:30:41 +00:00
李泽玺 272b2f0983 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'a534b14586c3fb83476044fe35460ea079641a66':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00