status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolved merge conflicts

This commit is contained in:
MagnumOpus21 2018-07-09 12:48:34 -04:00
parent 300330e24b 1cd1b55682
commit 9d57b72e81
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/proxy/manager.go
View File

@ -433,7 +433,7 @@ func (m *Manager) newProxy(mp *local.ManagedProxy) (Proxy, error) {
return nil, fmt.Errorf("error configuring proxy logs: %s", err)
}
// Pass in the environmental variables for this proxy process
// Pass in the environmental variables for the proxy process
cmd.Env = os.Environ()
// Build the daemon structure