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
adding bulk worker functions
changed the list_running_memebers function to return status as well
duplication fix
Add with_retcode option to ShellCase.run_call(). Also adds a test case for https://github.com/saltstack/salt/issues/6973 - expect a non-zero exit code when running "salt-call --retcode-passthrough state.highstate"
Add with_retcode options for ShellCase functions
Merge pull request #7225 from terminalmage/packaging

Fix/update RPM packaging files
pkg mods: latest_version: (1) always allow refresh arg (2) error on invalid kwargs
ec2 and service handlers added to keystone
added service and larger example to keystone state