Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 19b9cf714f - Show all commits

View File

@ -115,7 +115,7 @@ func render(tpl *template.Template, outputFile string, outputPerm os.FileMode, x
// the form sftp://[user@]host[:port]. // the form sftp://[user@]host[:port].
func UploadSFTP(identityFile, host, dir string, files []string) error { func UploadSFTP(identityFile, host, dir string, files []string) error {
sftp := exec.Command("sftp") sftp := exec.Command("sftp")
sftp.Stdout = nil sftp.Stdout = os.Stdout
sftp.Stderr = os.Stderr sftp.Stderr = os.Stderr
if identityFile != "" { if identityFile != "" {
sftp.Args = append(sftp.Args, "-i", identityFile) sftp.Args = append(sftp.Args, "-i", identityFile)