Commit Graph

8 Commits

Author SHA1 Message Date
Thomas Jackson
498a612078 Whitespace cleanup
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop
Conflicts:
	salt/minion.py
	salt/output/nested.py
2014-09-16 18:46:48 -05:00
rallytime
3e488df321 Cleanup azure docs 2014-09-15 15:50:43 -06:00
7oku
bb7c60fff8 removed doubled "provider: azure" statement
needed once only
2014-08-08 14:55:19 +02:00
Tim O'Guin
734ac983b3 added versionadded directive to MS Azure cloud docs 2014-03-03 12:03:40 -06:00
Joseph Hall
94f70e0804 management_host should be optional 2014-02-11 15:40:32 -07:00
Seth House
78363be2e9 rST fixes 2013-12-12 23:29:57 -07:00
Joseph Hall
18060f917d Initial commit of the Azure cloud driver 2013-12-10 20:26:55 -07:00