luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Resolved merge conflicts

This commit is contained in:
MagnumOpus21 2018-07-09 12:48:34 -04:00
parent 0b50b84429 e79f630adf
commit 3a00c5a834
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) 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() cmd.Env = os.Environ()
// Build the daemon structure // Build the daemon structure