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
..
buildenv	Adding missing .bat scripts for salt-master and friends	2015-05-15 20:14:32 -05:00
installer	Fixed problem with service not starting	2015-07-08 22:23:45 +00:00
BuildSalt.bat	Added ability to send a version with a space in it	2015-04-20 21:55:57 +00:00
portable.py	Fixed problem with pip not working on portable install	2015-04-06 23:04:24 +00:00