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
..
apiFunc	[REV] temp	2017-12-07 11:44:56 +08:00
apiRouters	[REV]Update cloud auth add put get interface	2017-12-07 16:37:09 +08:00
controller	Merge branch 'release-3.4'	2017-12-12 11:36:57 +08:00
daemon
db
discover
handler	[REV]Update validate time while recreate token	2017-12-08 18:53:53 +08:00
middleware	[REV] optimize build api proxy in api	2017-12-12 11:21:34 +08:00
model	[DEL]Update event_id remove required	2017-12-11 15:47:43 +08:00
proxy
region	[REV] optimize get task api,optimize show command,optimize install status command,optimize node status	2017-12-11 11:51:28 +08:00
server	[REV]Update api http/https	2017-12-07 19:59:15 +08:00
singleton
util