Seth House 53bab586f4 Merged salt-api into Salt ... Woot! The conflicts below are intentional because they contained salt-api-isms that needed to be included into the corresponding Salt files. Conflicts: debian/changelog debian/control doc/conf.py doc/index.rst opt_requirements.txt salt/config.py salt/loader.py		2014-06-18 22:13:56 -06:00
..
completion	Remove remaining exsel code	2014-05-29 01:32:54 +01:00
salt	Updated hashbangs with /usr/bin/env for virtual environment installs	2013-01-03 11:36:51 +02:00
salt-api	Merged salt-api into Salt	2014-06-18 22:13:56 -06: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