stack72 971b08f320 Merge conflict resolution of virtual_machine.html.markdown in AzureRM		2016-09-12 11:13:24 +01:00
..
bins	Implement archive provider and "archive_file" resource. (#7322)	2016-08-08 12:56:44 +12:00
providers	Merge conflict resolution of virtual_machine.html.markdown in AzureRM	2016-09-12 11:13:24 +01:00
provisioners	Make using `ssl_verify_mode` more robust (#7769)	2016-07-22 16:01:48 +02:00