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
Potential for for issue #7152
Enable to virt.init on an ESX host

WARNING: This is currently untested on a KVM/QEMU host, so this might
very well introduce a regression. Please review.
Make the profiles fall back to defaults based on active hypervisor
Make virt.init return backwards compatible

Though I think virt.init should return True or False.
Keep it DRY
Type in cloud_controller.rst
Merge pull request #7182 from holmboe/patch-1

Type in cloud_controller.rst
Fix https://github.com/saltstack/salt/issues/6785
Initial stab at the sqlite3 returner
Merge remote-tracking branch 'upstream/develop' into feature_sqlite3_returner
Added the sqlite3 returner to the docs. Fixed spelling mistakes.
Missed one
Added configuration entries to allow translating Salt docs