Colton Myers 2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/states/requisites.rst doc/topics/tutorials/states_pt5.rst salt/cloud/clouds/ec2.py salt/config.py salt/minion.py salt/modules/cp.py salt/pillar/__init__.py salt/states/file.py		2015-07-14 10:57:36 -06:00
..
saltstack	Fixing sphinx errors and warnings	2015-05-18 12:12:07 -04:00
saltstack2	bug fix for module function display in help	2015-07-09 14:13:29 -06:00