Commit Graph

508 Commits

Author SHA1 Message Date
bay1ts
ab87db2b96 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
	pkg/eventlog/store/handle_message_store.go
2017-12-07 16:09:26 +08:00
bay1ts
c2269ac74d [REV] optimize,merge new code 2017-12-07 16:05:59 +08:00
bay1ts
15d47b4ecf Optimize:update list command 2017-12-07 16:01:12 +08:00
bay1ts
922efec3de Optimize:remove callback 2017-12-07 15:57:06 +08:00
bay1ts
acc834d0b8 Optimize:merge dev to tenant_manage 2017-12-07 15:45:21 +08:00
bay1ts
47a24d094b Optimize:merge dev to tenant_manage 2017-12-07 15:44:53 +08:00
bay1ts
08668b9870 [REV] optimize node status 2017-12-07 15:27:57 +08:00
bay1ts
661676382d [REV] optimize node status 2017-12-07 14:53:40 +08:00
bay1ts
84b34ea2e9 [REV] optimize get tenant manage api 2017-12-07 14:01:46 +08:00
bay1ts
5617e1baf9 [REV] optimize get tenant by name 2017-12-07 13:47:25 +08:00
bay1ts
bd4f1bc7e1 [REV] optimize get tenant by name 2017-12-07 13:42:45 +08:00
bay1ts
8f3eb99c92 [REV] optimize get tenant by name 2017-12-07 13:36:56 +08:00
崔斌
cacba7dcd1 [REV]Update model 2017-12-07 12:18:28 +08:00
bay1ts
9d46c69ee2 [REV] optimize get tenant by name 2017-12-07 12:14:01 +08:00
bay1ts
f0039cb603 [REV] optimize get tenant by name 2017-12-07 12:08:25 +08:00
崔斌
d7962849c9 [REV] Update region api class union primary key 2017-12-07 11:57:16 +08:00
bay1ts
7faa677b00 [REV] temp 2017-12-07 11:44:56 +08:00
崔斌
803f0e1aee [ADD]Add api-addr-ssl port 2017-12-07 11:14:02 +08:00
bay1ts
3d35f8b3db [REV] optimize args validate 2017-12-07 11:07:51 +08:00
崔斌
2c2575dc09 [REV]Update swagger 2017-12-07 10:53:29 +08:00
崔斌
2699573e79 [FIX]Fix eid bug 2017-12-07 10:48:10 +08:00
崔斌
9c5764a3c1 [REV]Update eid get 2017-12-07 10:42:32 +08:00
崔斌
5f7f63ae42 [REV]Update eid required 2017-12-07 10:16:42 +08:00
崔斌
48bb9e7745 [REV]Update eid string required 2017-12-07 10:09:32 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
goodrain
ffc1b575a8 [FIX] Merge release-3.4 2017-12-07 09:50:00 +08:00
bay1ts
4e28e05b4c [REV] optimize paged resource 2017-12-07 00:35:44 +08:00
bay1ts
dbcceea561 [REV] optimize paged resource 2017-12-07 00:29:05 +08:00
bay1ts
0520a5a9fb [REV] optimize paged resource 2017-12-07 00:14:38 +08:00
bay1ts
42c0329682 [REV] optimize paged resource 2017-12-07 00:09:10 +08:00
bay1ts
9c387c15c8 [REV] optimize paged resource 2017-12-06 23:57:31 +08:00
bay1ts
d694c8db60 [REV] optimize paged resource 2017-12-06 23:51:34 +08:00
bay1ts
09daef4c82 [REV] add update version in app_slug 2017-12-06 20:13:30 +08:00
bay1ts
2fa203c453 [REV] add update version in app_image 2017-12-06 20:10:26 +08:00
bay1ts
901cad8174 [REV] update log,add update version in app_image 2017-12-06 19:34:56 +08:00
bay1ts
bb9ed5ad2c Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-06 18:34:14 +08:00
bay1ts
e0eaa37167 [REV] update log 2017-12-06 18:33:50 +08:00
bay1ts
ed6e5b8ce5 [REV] temp 2017-12-06 17:51:33 +08:00
bay1ts
3c0bc37ec3 [REV] add vendor 2017-12-06 17:18:26 +08:00
bay1ts
93f054a30b [REV] add vendor 2017-12-06 17:14:06 +08:00
bay1ts
aa3e2a6f5f [REV] optimize tenant query api 2017-12-06 17:09:49 +08:00
bay1ts
9f7bbe2c87 [REV] optimize possible error 2017-12-06 16:45:16 +08:00
bay1ts
94c3b2426d [REV] sort response by used memory (next cpu) 2017-12-06 15:57:28 +08:00
bay1ts
5987a7eacd [REV] sort response by used memory (next cpu) 2017-12-06 15:54:37 +08:00
goodrain
e6b5cb3eb5 Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-06 15:33:58 +08:00
goodrain
e659850a2a [FIX] Resolve failed bugs in stateful service service storage 2017-12-06 15:33:35 +08:00
bay1ts
5c284f9581 [REV] remove unneeded validate 2017-12-06 15:32:25 +08:00
bay1ts
3a2b82d3ca [REV] add get tenant with resource api 2017-12-06 15:26:21 +08:00
bay1ts
a4b99ac94d [FIX] fix when update version,cause nil pointer 2017-12-06 12:40:21 +08:00
bay1ts
ee983c788d [ADD] add interface for manage service ,get all tenants with alloc res and used res from region 2017-12-06 11:13:56 +08:00