Adds --show-timeout to force the display of unresponsive minions
Removes debugging and badly merged code
Merge remote-tracking branch 'upstream/develop' into tomcat6_support
Merge remote-tracking branch 'upstream/develop' into tomcat6_support
support windows local war files
using cp.get_url instead of up.get_file
docfix in tomcat state
Allow salt-call to specify alternate minion id
Fix issue #6833
Finish what was started in 53abda36
Add a test case for #6833. Refs #7130.
Don't include pip in the resulting packages if a prefix is being used, not the right one. Refs #6833, #7130.
Adapt mocked tests to the changes in #6833
Add option to allow SVN to trust server identity.
Typo in original for trust server cert.
Tenant deletion in keystone modules
fixed user tenant updating
Merge pull request #7158 from KennethWilke/develop

More Keystone tenant stuff
grammar fix in salt.utils.warn_until docstring
add salt.utils.kwargs_warn_until()