Commit Graph

5 Commits

Author SHA1 Message Date
Mathieu Le Marec - Pasquet
dafb765ad6 factorize call 2014-11-11 17:43:05 +01:00
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
Thomas Jackson
963effa0ea rest_tornado
An async implementation of the salt api
2014-04-14 21:12:07 -07:00
Thomas S Hatch
760d3f6720 clean up loader module 2012-09-24 14:45:36 -06:00
Thomas S Hatch
8f03f76b43 Add scripts 2012-09-24 13:21:59 -06:00