Commit Graph

130 Commits

Author SHA1 Message Date
goodrain
b488aea375 Merge branch 'master' into app-detection 2018-02-08 09:39:38 +08:00
pujielan
0419acc392 [REV] unused user rain 2018-02-07 14:50:15 +08:00
goodrain
f249b614c7 [FIX] resolve get event info bug 2018-02-06 14:59:21 +08:00
pujielan
a1a6414bc1 [REV] Update swagger 2018-02-05 19:30:44 +08:00
goodrain
807f9b86dc [ADD] merge master branch 2018-02-05 13:40:08 +08:00
pujielan
c9fca6d855 [REV] Update swagger json 2018-02-05 11:04:01 +08:00
pujielan
f36f7e4fe4 [REV] Add cloud share ftp config 2018-02-05 10:47:59 +08:00
pujielan
f88673d887 [REV] Add service check info 2018-01-23 15:58:10 +08:00
pujielan
eef60dd80b [REV] Update service check routers 2018-01-22 18:08:31 +08:00
pujielan
247018bbcb [REV] Update service check routers 2018-01-22 18:00:45 +08:00
goodrain
80072fa62e [FIX] add vendor package 2018-01-22 16:50:23 +08:00
pujielan
efb5c7defb [ADD] Add rainbond plugin share 2018-01-18 13:49:07 +08:00
goodrain
1d19f75476 [FIX] Merge master code to handle conflicts.
Prepare to incorporate performance analysis capabilities into the trunk.
2018-01-10 18:49:17 +08:00
goodrain
06f92a78c6 [ADD] add docker run parser and image handle 2018-01-10 13:35:05 +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
f61eed20a7 [REV] Update plugin sys support rebuild and envs batch update 2018-01-04 13:51:35 +08:00
ysicing
3113de137d [REV] update proxy script for compute node: data duplication. closed #23 2018-01-03 19:10:32 +08:00
ysicing
11249f790c [REV] add depends for install_network #24 2018-01-03 17:52:12 +08:00
ysicing
8ad653c9d0 [FIX] change adapter version info; 2018-01-03 15:42:08 +08:00
ysicing
23c948fb69 [FIX] Update the storage installation order. close #18 2018-01-02 22:51:01 +08:00
pujielan
28c5c9bff0 [ADD] Add region support protocol list 2018-01-02 18:02:08 +08:00
ysicing
78ab94e5f8 [FIX] update dns_modify script for rbd-dns .closed #21 2018-01-02 12:35:50 +08:00
ysicing
68689d05e9 [REV] Support compute nodes to add rain users 2017-12-27 17:41:53 +08:00
ysicing
798eec5417 [FMT] del useless dependence 2017-12-26 19:04:00 +08:00
ysicing
8959e305fa update entrance 2017-12-26 18:35:37 +08:00
ysicing
29c09d09bd [REV] add host_id_list.conf restart api 2017-12-26 17:43:49 +08:00
ysicing
88eeba8087 [REV] Adjust the installation script 2017-12-26 11:58:52 +08:00
ysicing
2de927e20b [REV] merge branch gaops_release_3.4.1 2017-12-26 10:47:50 +08:00
Bay
6eda29736c
[REV] cancel publish callback to console 2017-12-22 18:20:48 +08:00
pujielan
86f9f446a6 [ADD]Add tenant event log 2017-12-20 19:04:09 +08:00
goodrain
42afa03e72 [FIX] Merge branch 'release-3.4' 2017-12-18 18:50:10 +08:00
ysicing
d86252512e [FIX] Adjust k8s check 2017-12-18 16:48:35 +08:00
pujielan
3f3bf9b3b0 [ADD]Add cloud auth annotation 2017-12-18 11:05:56 +08:00
ysicing
622dc145d5 [FIX] resolved #4 Node ip unconventional intranet ip 2017-12-15 18:57:47 +08:00
bay1ts
9b19df72a5 [REV] merge from master 2017-12-15 17:23:59 +08:00
goodrain
d9a7a2aa7e [FIX] Merge branch release-3.4 to master 2017-12-15 17:07:55 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
bay1ts
a6953fd108 [FIX] remove builder service reg;change deploy api from start to upgrade;update build api;add try catch in chaos 2017-12-15 14:17:02 +08:00
goodrain
1aac0de5cd [ADD] add statsd exporter module to node 2017-12-14 18:30:52 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
ab3922c9f7 [REV] Optimize plugin system 2017-12-13 17:38:45 +08:00
崔斌
9963604969 [REV] Optimize plugin system 2017-12-13 12:10:53 +08:00
goodrain
6e5db326e7 [FIX] Merging branches 2017-12-12 21:56:40 +08:00
ysicing
15324b788b [FIX] Resolve to reinitialize the db passwd 2017-12-12 19:45:55 +08:00
ysicing
7727064f65 [FMT] Remove unused dependencies 2017-12-12 16:42:40 +08:00
崔斌
e198c80ed9 [REV] Add discover env - DISCOVER_URL when creating plugin pods 2017-12-12 15:25:47 +08:00
bay1ts
d53f2181ae Merge remote-tracking branch 'origin/master' 2017-12-12 14:07:31 +08:00
bay1ts
c8c50e1bc6 [REV] optimize code check 2017-12-12 14:07:21 +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