Colton Myers 7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: conf/master conf/minion doc/ref/configuration/master.rst salt/loader.py salt/minion.py salt/modules/ssh.py salt/output/nested.py salt/utils/network.py		2015-03-25 09:28:04 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers.d	Add more URL clarifications	2014-08-07 16:25:14 -06:00
cloud	Typo fix and formatting	2014-11-13 13:59:23 -07:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Chmod files back to original	2014-03-22 17:47:54 +01:00
master	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-25 09:28:04 -06:00
minion	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-25 09:28:04 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00