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
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
Merge pull request #7245 from ranl/modjk

fixing modjk.recover_all function
Add missing import.
Merge pull request #7246 from s0undt3ch/develop

Add missing import.
Merge remote-tracking branch 'upstream/develop' into develop
Allow user to use the '--global' flag for git config settings.

This resolves #7156
By default 'is_global' is set to False.
Side Effects: Each call to config_set includes the '--local' or '--global'
flags.
Audit module documentation (U to W)

This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
Merge pull request #7251 from terminalmage/docs

Audit module documentation (U to W)
Merge pull request #7248 from jcockhren/add_global_flag_git_config

Add global flag git config
Modify sys.doc to replace rst directives

This commit modifies sys.doc so that the rst directives within it look
better on the CLI when the docs are printed to the terminal.
Add halite startup hooks into the master
Adding an option to queue state commands instead of failing immediately