valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66f4641be3
salt/conf
History
Colton Myers 66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
2015-09-16 18:39:16 -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 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-16 18:39:16 -06: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.5 2015-09-16 18:39:16 -06:00
minion Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-16 18:39:16 -06:00
roster Added default config for salt-ssh 2013-10-01 23:54:51 +10:00