Colton Myers ad89a752f8 Merge branch '2014.7' into develop ... Conflicts: salt/cloud/__init__.py salt/utils/cloud.py		2014-08-25 13:29:29 -06:00
..
esky	Merge branch '2014.7' into develop	2014-08-25 13:29:29 -06:00
salt-master.xml	pkg/smartos : fix the manifest of salt-master to start@boot	2013-05-30 20:33:16 +02:00
salt-minion.xml	Add a method context environment PATH	2014-06-22 11:38:35 +02:00
salt-syndic.xml	smartos : change default config directory for Salt services	2013-05-20 13:00:38 +02:00