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
Don't include authorship in generated documentation.
Merge pull request #7265 from s0undt3ch/develop

Don't include authorship in generated documentation.
Sometimes rxtx_factor isn't there
Same kind of problem with minDisk and minRam
Merge pull request #7266 from techhat/novafix

Fixing openstack nova error with rxtx_factor
Add nova.boot function
Merge pull request #7267 from techhat/novafix

Add nova.boot function
Clarify docs for nova.create
Fix sphinx build warnings/errors
Fix more missing key errors
Add function to delete instance