Merge remote-tracking branch 'ungleich/feature/trigger' into feature/trigger

2016-10-30 15:09:26 +01:00 · 2016-10-30 15:09:26 +01:00 · 7c169f2d0a
commit 7c169f2d0a
parent ca67533ce4 535181435f
3 changed files with 41 additions and 12 deletions
--- a/scripts/cdist
+++ b/scripts/cdist
@ -150,6 +150,7 @@ def commandline():
           '-s', '--sequential',
           help='Operate on multiple hosts sequentially (default)',
           action='store_false', dest='parallel')
+
    # remote-copy and remote-exec defaults are environment variables
    # if set; if not then None - these will be futher handled after
    # parsing to determine implementation default