5 commits

Author	SHA1	Message	Date
DavidVentura	c5a8b78956	fix merge conflicts (#19481)	2017-02-09 12:55:25 +00:00
DavidVentura	b5811ccb8a	proxmox: Add public key support: fix #19487 (#21142) ... * fix #19487 * add 'version_added' * Check for version compatibility, Ignore keys if incompatible * add comment about version support * remove 'type' as requested * fix merge error	2017-02-09 09:45:41 +00:00
Matt Clay	10d9318de7	PEP 8 indent cleanup. (#20800) ... * PEP 8 E121 cleanup. * PEP 8 E126 cleanup. * PEP 8 E122 cleanup.	2017-01-29 07:28:53 +00:00
Andrea Tartaglia	ef391a11ec	Removed dict.iteritems() in modules. (#18859) ... This is for py3 compatibility, addressed in #18506	2016-12-12 15:16:23 -08:00
James Cammarata	011ea55a8f	Relocating extras into lib/ansible/modules/ after merge	2016-12-08 11:35:18 -05:00

Renamed from lib/ansible/modules/extras/cloud/misc/proxmox.py (Browse further)