Commit Graph

213 Commits

Author SHA1 Message Date
pujielan
ac2262bf75 [REV] Optimize function result code and msg 2017-12-24 22:40:15 +08:00
pujielan
8088fada79 [FIX]Fix etcd connection in define resource 2017-12-24 21:26:21 +08:00
pujielan
86f9f446a6 [ADD]Add tenant event log 2017-12-20 19:04:09 +08:00
pujielan
f3cddb257e Merge branch 'master' into cuib-local-master 2017-12-20 15:21:54 +08:00
pujielan
68f37b0f39 [FIX]Fix config_envs annotation 2017-12-20 15:19:56 +08:00
goodrain
42afa03e72 [FIX] Merge branch 'release-3.4' 2017-12-18 18:50:10 +08:00
pujielan
739091c23e [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 16:48:57 +08:00
goodrain
b665fa0237 [FIX] Unified service registry logic
resolve bug #11
2017-12-18 14:44:25 +08:00
pujielan
e8cccc305b [FIX]Fix cant delete service error bug
## Process trans service records to a table named “tenant_services_delete” when user delete their service.
## This problem will appear if the count of the  “delete table”(s) records larger than service table(s).
2017-12-18 14:11:43 +08:00
pujielan
3f3bf9b3b0 [ADD]Add cloud auth annotation 2017-12-18 11:05:56 +08:00
pujielan
8899c8bbac [REV] compatibility old interface eid tenant_name 2017-12-15 19:02:35 +08:00
pujielan
2af927d022 [REV] compatibility old interface eid tenant_name 2017-12-15 19:01:14 +08:00
pujielan
a2c875d661 [REV] compatibility old interface eid tenant_name 2017-12-15 18:54:08 +08:00
bay1ts
a9153e7437 [REV] merge from code 2017-12-15 16:49:24 +08:00
bay1ts
59a544c6b4 [FIX] fix deploy version,match chaos,use upgrade 2017-12-15 14:32:30 +08:00
pujielan
8c7aed3d3f [DEL]Delete plugin default env in region 2017-12-15 12:22:14 +08:00
pujielan
115328e08a [REV] Optimize plugin system 2017-12-14 17:33:14 +08:00
pujielan
7861db5f98 [REV]Update rainbond lds cds sds server 2017-12-14 16:33:45 +08:00
pujielan
1aa710b977 [REV] Optimize plugin pod build 2017-12-14 10:50:03 +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
崔斌
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
goodrain
95f5e8aebe Merge branch 'release-3.4'
# Conflicts:
#	pkg/builder/api/router.go
#	pkg/grctl/cmd/init.go
#	pkg/grctl/cmd/installStatus.go
#	pkg/grctl/cmd/node.go
2017-12-12 11:36:57 +08:00
bay1ts
36fc1ce593 [REV] optimize build api proxy in api 2017-12-12 11:21:34 +08:00
bay1ts
67e531820a Merge remote-tracking branch 'origin/master' 2017-12-12 10:07:55 +08:00
bay1ts
76cf3e527f [REV] optimize build api proxy in api 2017-12-12 10:07:25 +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
eb73a38f59 [REV] optimize get task api,optimize show command,optimize install status command,optimize node status 2017-12-11 11:51:28 +08:00
bay1ts
66f6db7361 [REV] optimize grctl show command 2017-12-11 11:10:36 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
bay1ts
db6808eca0 [REV] optimize grctl install 2017-12-08 23:31:47 +08:00
崔斌
cdbd46c6da [REV]Update validate time while recreate token 2017-12-08 18:53:53 +08:00
崔斌
f0a43de3b9 [REV]Update cloud auth show table format 2017-12-08 18:47:55 +08:00
崔斌
c68f30daad [ADD]Add grcth auth command 2017-12-08 17:14:12 +08:00
bay1ts
8f5bcf40e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-08 15:34:04 +08:00
崔斌
9c53b383e9 [REV]Update notation 2017-12-08 10:16:29 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
崔斌
05d2d97496 [REV]Update api range 2017-12-07 21:32:09 +08:00
崔斌
73c6b3a32d [REV]Update api http/https 2017-12-07 19:59:15 +08:00
崔斌
850e43964e [ADD]Add err log in eventlog 2017-12-07 18:29:31 +08:00
崔斌
04046d4a71 [REV]Update swagger 2017-12-07 17:25:27 +08:00
崔斌
6201d9a95c [REV]Update https 2017-12-07 17:15:03 +08:00
崔斌
47464c30a3 [REV]Update cloud auth add put get interface 2017-12-07 16:37:09 +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
bay1ts
c2269ac74d [REV] optimize,merge new code 2017-12-07 16:05:59 +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
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