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
Commit f809f91 changed the fileclient from urllib2 to requests. To properly build a .deb package we need to add python-requests to the build dependencies.
Applying latest changes for packaging
Fixed typos in man pages
Latest round of changes
More packaging fixups
Fixed salt-common typo
Fixed wildcarding in install files
Removed extra man pages
Removed trailing slash
Fixed links
Moved binaries to proper packages
Fixed man pages
Pathing
Perms tweak
Missing files
Fixed spacing
Fixed another lintian error
build the msgpack stuff
Updating rules and install files
Fixed shebang
Control updates
Fixed copyright file
Fixed lintian
Fixed overrides
cmd.retcode no longer uses subprocess.call since it is broken
fix issue with source_hash and trailing whitespace
Bye-bye pickle, hello msgpack
Add docs for new source powers
Add support for source_hash to be a source hash string
add pure python template type
add return clarifying that no states were found if no states are found
change some strings to use format
add code to cache jobs on the minion if option is set
serialize cache data
was caching the wrong line data
Add cache_jobs to the minion config template
add docs for new config param cache_jobs
make the minions return to the master in addition to returning to
returners
Add capability to designate multiple returns
only run the apache module if apachectl is installed
only load solr module if solr is installed
Debug statement used the wrong variable.
Only load nginx on machines that have nginx installed
Make it more like the apache module
