Colton Myers 73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/gce.rst doc/topics/windows/windows-package-manager.rst salt/client/ssh/state.py salt/cloud/clouds/ec2.py salt/modules/defaults.py salt/modules/file.py salt/utils/cloud.py		2015-09-29 14:56:41 -06:00
..
all	Added autodoc generated pages for the new modules types	2015-04-03 12:45:49 -06:00
backends.rst	Improve salt fileserver documentation	2015-02-27 14:53:57 -07:00
dynamic-modules.rst	Outputters should sync to output, not outputters, on the minion.	2015-09-28 16:53:53 -06:00
file_roots.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Bug fixes and build errors	2015-06-05 17:32:35 -06:00