Colton Myers 8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/cloud/clouds/msazure.py salt/modules/boto_sns.py salt/states/boto_sns.py tests/integration/modules/boto_sns.py tests/integration/states/boto_sns.py		2015-01-23 14:20:34 -07:00
..
esky	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-23 14:20:34 -07: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