Merge current branch v2.4 into master
This commit is contained in:
commit
cb4fb973b2
41 changed files with 1857 additions and 1424 deletions
|
@ -224,6 +224,10 @@ func setupServer(staticConfiguration *static.Configuration) (*server.Server, err
|
|||
})
|
||||
}
|
||||
|
||||
if staticConfiguration.Pilot != nil {
|
||||
version.PilotEnabled = staticConfiguration.Pilot.Dashboard
|
||||
}
|
||||
|
||||
// Plugins
|
||||
|
||||
pluginBuilder, err := createPluginBuilder(staticConfiguration)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue