valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
21305e7719
salt/pkg/arch
History
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
..
git Fixed bash-completion error 2013-06-02 08:29:13 +02:00
Makefile Move salt-monitor scripts and packaging to salt-monitor project 2011-08-10 11:20:33 -06:00
PKGBUILD Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
PKGBUILD-git Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
PKGBUILD-local Fix wrong permissions 2014-03-23 18:22:35 +00:00
salt-api_PKGBUILD Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
salt-api_PKGBUILD-git Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
salt-master.service Add service files for ArchLinux. 2012-10-26 09:54:08 +11:00
salt-minion.service Add service files for ArchLinux. 2012-10-26 09:54:08 +11:00
salt-syndic.service Add service files for ArchLinux. 2012-10-26 09:54:08 +11:00