Colton Myers 9a89057f83 Merge branch '2014.7' into merge-forward ... Conflicts: salt/transport/__init__.py		2014-11-13 12:40:24 -07:00
..
completion	show_timeouts, new default	2014-08-14 13:10:52 -04:00
salt	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-api	factorize call	2014-11-11 17:43:05 +01:00
salt-call	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-cloud	Modernize the salt-cloud script	2013-11-08 14:11:27 -07:00
salt-cp	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-key	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-master	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-minion	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-run	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-ssh	Add salt-ssh script	2013-07-01 15:48:23 -06:00
salt-syndic	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-unity	Add salt-unity script	2014-02-26 15:15:36 -07:00