Commit Graph

101 Commits

Author SHA1 Message Date
pujielan
e7f3860745 [ADD] Add rainbond plugin share 2018-01-18 13:45:24 +08:00
pujielan
517e69133e [REV] tenant disk resource use MB as unit 2018-01-15 14:36:49 +08:00
pujielan
3b55295100 [REV] Update disk use MB 2018-01-15 14:29:33 +08:00
pujielan
e90e03f1d7 [REV] Update disk use MB 2018-01-15 14:24:18 +08:00
pujielan
16c9478b58 Merge branch 'master' into plugin 2018-01-12 17:42:47 +08:00
pujielan
de8a108a63 [REV] Add disk usage statistics 2018-01-12 17:40:24 +08:00
pujielan
6c4c1ba9de [REV] Add disk usage statistics 2018-01-12 17:37:37 +08:00
pujielan
c19740724f [REV] Add disk usage statistics 2018-01-12 17:29:43 +08:00
pujielan
13fb2e4c12 [REV] Add v2 builder uri controller 2018-01-12 17:02:57 +08:00
pujielan
ea578fdb0c [REV] Optimizing building log 2018-01-05 15:12:11 +08:00
pujielan
0a5282913e Merge branch 'master' into cuib-local-master
# Conflicts:
#	hack/contrib/docker/chaos/Dockerfile
#	pkg/api/handler/tenant.go
#	pkg/db/mysql/mysql.go
2018-01-05 10:45:04 +08:00
pujielan
69125f3dd4 [REV] Update chaos set user rain with root permission 2018-01-05 10:40:21 +08:00
pujielan
8be1ce0a27 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:32:55 +08:00
pujielan
6dac5a79d2 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 18:18:51 +08:00
pujielan
695f189bcf [ADD] Add region support protocol list 2018-01-02 18:04:51 +08:00
pujielan
28c5c9bff0 [ADD] Add region support protocol list 2018-01-02 18:02:08 +08:00
pujielan
b695bbd54d [FIX] Fix add env attr bug 2017-12-28 14:40:32 +08:00
Bay
31d03f70d8 Merge remote-tracking branch 'github/master' into githubmaster 2017-12-28 11:03:58 +08:00
Bay
d4f8512a7d [FIX] fix save in codecheck and event;merge from release to fix some error 2017-12-28 10:18:52 +08:00
pujielan
a1670a00d1 [FIX]Fix get mysql record bug 2017-12-27 17:58:17 +08:00
pujielan
025bfae524 [REV] Update plugin condition 2017-12-26 10:41:52 +08:00
bay1ts
cb3331bfc0 [REV] merge from code 2017-12-15 16:55:17 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
pujielan
8c7aed3d3f [DEL]Delete plugin default env in region 2017-12-15 12:22:14 +08:00
pujielan
f25454c082 [FIX]Fix container cmd bug 2017-12-15 00:28:25 +08:00
pujielan
1aa710b977 [REV] Optimize plugin pod build 2017-12-14 10:50:03 +08:00
崔斌
9963604969 [REV] Optimize plugin system 2017-12-13 12:10:53 +08:00
pujielan
ab86bebeec [DEL]Delete plugin env copy in region 2017-12-12 19:04:44 +08:00
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +08:00
崔斌
ef04e7dbc0 [REV]Update service’s plugin setting with build_version
[FIX]Repair few annotation bugs
2017-12-12 12:52:29 +08:00
崔斌
683d535453 [DEL]Update event_id remove required
[REV]Update plugin table add json annotation
2017-12-11 15:47:43 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
崔斌
f0a43de3b9 [REV]Update cloud auth show table format 2017-12-08 18:47:55 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
崔斌
de7226febd [DEL]Delete event log table build in api 2017-12-07 19:37:32 +08:00
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
崔斌
cacba7dcd1 [REV]Update model 2017-12-07 12:18:28 +08:00
崔斌
d7962849c9 [REV] Update region api class union primary key 2017-12-07 11:57:16 +08:00
崔斌
803f0e1aee [ADD]Add api-addr-ssl port 2017-12-07 11:14:02 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
bay1ts
d694c8db60 [REV] optimize paged resource 2017-12-06 23:51:34 +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
ed6e5b8ce5 [REV] temp 2017-12-06 17:51:33 +08:00
bay1ts
9f7bbe2c87 [REV] optimize possible error 2017-12-06 16:45:16 +08:00
goodrain
e659850a2a [FIX] Resolve failed bugs in stateful service service storage 2017-12-06 15:33:35 +08:00
bay1ts
a5cb32947f [FIX] fix Possible error when publish app 2017-12-05 12:25:24 +08:00
崔斌
aa19c50eda [REV] Update record length 2017-12-04 09:57:26 +08:00
崔斌
22f5f0f887 [REV]Update sql 2017-12-03 22:35:01 +08:00
崔斌
b563245ed1 [REV]Update swagger and sql record 2017-12-03 21:56:21 +08:00
崔斌
b998160250 [ADD]Add user token Dispatcher and token verify 2017-12-03 19:11:16 +08:00