崔斌 1506945c3c Merge branch 'master' of code.goodrain.com:goodrain/rainbond ... # Conflicts: # pkg/builder/model/model.go		2017-11-24 18:25:13 +08:00
..
api	[REV] update app_publish entity	2017-11-24 18:02:35 +08:00
discover	[REV] builder api optimize;add service discover to builder;import unify db to eventlog;remove unused event_id;add event entity ;create event in controller level;add event status update	2017-11-16 16:30:22 +08:00
exector	[FIX] fix code	2017-11-24 16:58:22 +08:00
model	Merge branch 'master' of code.goodrain.com:goodrain/rainbond	2017-11-24 18:25:13 +08:00