Brandon Tosch 193c25788d Merge branch 'master' into brandontosch/GH-11874 ... # Conflicts: # vendor/vendor.json		2017-03-05 18:03:40 -08:00
..
bins	New Provider: Spotinst (#5001)	2017-02-22 22:57:16 +02:00
providers	Merge branch 'master' into brandontosch/GH-11874	2017-03-05 18:03:40 -08:00
provisioners	remove log.Fatal from test	2017-02-24 18:48:48 -05:00