saltstack/salt — pull request #8282 by cachedout (2013-11-05 20:30:58+00:00)
Title: salt-ssh opts

DO NOT BLINDLY MERGE

@thatch45 While this does address the concern raised in the issues below, I don't fully understand the reasoning behind test.opts_pkg. (I think it's possibly to avoid a chicken-and-egg problem but I'm not positive.) At any rate, please review this to ensure that this is the correct approach. There's every chance that you have more expansive plans for handling configuration options in salt-ssh that I just don't know about. This might be waaaay too simple, so I'd like you to look at it, please.

This is a two-line change that merges the user-defined options into SSH wrappers. It addresses concerns raised by users that that salt-ssh does not respect settings like file-roots when they are defined in a configuration file. Refs #8005 and #8271.