New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[2015.8] Merge forward from 2015.5 to 2015.8 #27111
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes saltstack#26798. At the start of the provisioning process, linode reports VM names by their linode ID, which is represented by the driver as an integer.
stringify linode id before performing str actions
Added check for PyMySQL if MySQLdb import fails
Fixed user.rename function in windows
add default param in _parse_localectl in locale mod
Gated the dbus include for os families that are currently using it within this module at this time. Renamed some defs to more appropriately express their function.
use dbus instead of localectl
…rom-snapshot-in-dov2 [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider
modify groupadd for rhel 5
states/pkgrepo examples, suse installation updates
The directive `lxc.network.ipv4.gateway = auto` should not be added to an LXC configuration file when no IP address is specified. It results in the following error: ``` lxc-start 1441227080.264 ERROR lxc_conf - conf.c:setup_netdev:2724 - Cannot add ipv4 gateway for eth0 when not assigning an address ```
Back-port saltstack#26852 to 2015.5
Fix minor doc typo in client api
Update softlayer docs for where to find apikey
This also makes some optimizations by not assigning the output of functions to variables when unnecessary, and changes this module to pass arguments to the cmd.run functions as list instead of a string. It also changes some weird behavior for the loginclass functions. There's no reason to return a dictionary that will only have one element, and there is no reason to return a string that is literally just two quotes (i.e. '""') when there is no login class found. An empty string is sufficient, and has the benefit of also evaluating as False as a boolean.
…anager useradd.py: Use contextmanager to prevent leaked filehandles
Better try and error handling for prep_jid
…un once for all packages rather than once per package
_cmd_quote would raise with unexplicit error if _fn = False
When a pkg name is not specified, this should just run `npm install --json`. The check that was removed prevented this from happening and also prevented the 'npm.bootstrap' state from working correctly.
salt.utils.aws has more feature complete methods to retrieve same data
Deprecate salt.utils.iam in Carbon
….0 has been released
Run repoquery less
Back-port saltstack#26930 to 2015.5
Back-port saltstack#26992 to 2015.5
Back-port saltstack#27029 to 2015.5
Remove "use develop branch" warning from LXC tutorial
Replaced password with redacted when displayed
add test support for htpasswd state mod
Add support for PEERNTP network interface configuration
Conflicts: doc/topics/reactor/index.rst salt/cloud/clouds/digital_ocean_v2.py salt/modules/groupadd.py salt/modules/localemod.py salt/modules/mysql.py salt/modules/useradd.py salt/modules/win_pkg.py salt/modules/win_useradd.py salt/netapi/rest_cherrypy/app.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/htpasswd.py salt/states/user.py
Go Go Jenkins! |
jfindlay
added a commit
that referenced
this pull request
Sep 15, 2015
[2015.8] Merge forward from 2015.5 to 2015.8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[2015.8] Merge forward from 2015.5 to 2015.8