From 2dfc30e3c45bda3cd5737d3b6064008256cd0d9b Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Thu, 10 Mar 2016 20:01:08 +0100 Subject: [PATCH] Revert "Add ssh multiplexing options to default REMOTE_EXEC and REMOTE_COPY." This reverts commit bb43a8f47f4436d424b4b4ba8eda6e7fabc0245f. --- cdist/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cdist/__init__.py b/cdist/__init__.py index 28464710..4454a3ac 100644 --- a/cdist/__init__.py +++ b/cdist/__init__.py @@ -41,10 +41,8 @@ BANNER = """ "P' "" "" """ -SSH_MUX_OPTS = ("-o ControlPath=~/.ssh/master-%l-%r@%h:%p" - " -o ControlMaster=auto -o ControlPersist=125") -REMOTE_COPY = "scp -o User=root -q " + SSH_MUX_OPTS -REMOTE_EXEC = "ssh -o User=root -q " + SSH_MUX_OPTS +REMOTE_COPY = "scp -o User=root -q" +REMOTE_EXEC = "ssh -o User=root -q" class Error(Exception): """Base exception class for this project"""