Fix for #14915 #34254
Merged
Fix for #14915 #34254
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
|
@sjorge We might need some unit tests adjusted here. Could you take a look? |
|
I'll have a look this weekend |
|
I added the kernel grain tot the tests where needed. |
|
Thanks @sjorge! |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 27, 2016
* upstream/develop: Fix pylint error Remove test that doesn't actually test anything Don't escape source before calling managed Fix for saltstack#14915 (saltstack#34254) Fixed symlinks on windows where the slashes don't match ipset: fix the comment containing blank Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer ipset: fix commont containing blank Fix win_system.set_system_date_time win_pkg: refresh pkg database if refresh=True passed to version() or list_pkgs() Catch CommandExecutionError in pkg states some cleanup and renaming better way to check for openSUSE Leap Fix for SUSE OS grains in 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.
What does this PR do?
Makes mount.active, mount.is_mounted, mount.swaps, mount.swapon and mount.swapoff work on solarish systems.
mount.fstab is still broken, I couldn't find a way to fix it and maintain compatibility.
I can provide a copy of a Solaris (v)fstab file if that would help.
What issues does this PR fix or reference?
#14915
Previous Behavior
Above commands did not work
New Behavior
Above commands work
Tests written?
No
Affected branches