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
I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.
This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.
POTENTIAL FIX: Issue #5813
*) Handle refresh param in install()
*) Fix upgrade(): freebsd-update does'nt care about packages, it's about OS itself. But there is not easy way to upgrade package with old package system.
*) Fix docstring example in search()
*) Bring the changes above to the man page
As reported by lintian while doing Debian packaging work:
| I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Alot A lot
| I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dependancy dependency
| I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dependant dependent
| I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified
plus one minor one I stumbled upon (sucsessfully -> successfully).
M2Crypto has been abandonded upstream, has many outstanding bugs,
and doesn't build unpatched on Fedora. Since the only thing M2Crypto
is being used for in the salt codebase is RSA support, using the PyCrypto
RSA module instead is pretty straight forward. Additionally, the RSA
module uses sign/verify terminology around our use of private encrypting
known tokens for verification purposes rather than private_encrypt and
public_descrypt, which makes reading the intent a little clearer.
To ensure the YAML structure correctly assigns 'context' & 'defaults' as
dicts the elements under context & defaults need an extra set of
indents.
Example:
- example:
test: 1
Compiles to: [{'example': None, 'test': 1}]
While:
- example:
test: 1
Correctly compiles to: [{'example': {'test': 1}}]
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
Some docstrings where clearly leftovers from previous copy-paste actions or
contained wrong information. I fixed those, together with the salt (7) manpage.
