Thomas S Hatch 65b6d0e005 Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2 ... Conflicts: salt/config.py		2014-04-30 13:00:26 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.providers.d	Fix wrong permissions	2014-03-23 18:22:35 +00:00
cloud	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles	Fixing up cloud.profiles with more valid configs	2013-11-20 08:51:51 -07:00
cloud.providers	Chmod files back to original	2014-03-22 17:47:54 +01:00
master	Raise max to 1 MiB.	2014-04-29 17:09:14 -06:00
minion	Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2	2014-04-30 13:00:26 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00