Merge remote-tracking branch 'upstream/develop' into BigRefactor
This commit is contained in:
commit
a8dfa19b3a
9 changed files with 43 additions and 10 deletions
|
|
@ -154,6 +154,8 @@ func NewAgentConfig() *rmm.AgentConfig {
|
|||
Cert: viper.GetString("cert"),
|
||||
Proxy: viper.GetString("proxy"),
|
||||
CustomMeshDir: viper.GetString("meshdir"),
|
||||
NatsProxyPath: viper.GetString("natsproxypath"),
|
||||
NatsProxyPort: viper.GetString("natsproxyport"),
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue