[2016.3] Merge forward from 2015.8 to 2016.3 #36344
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
Conflicts: - tests/unit/modules/blockdev_test.py
rallytime
pushed a commit
to rallytime/salt
that referenced
this pull request
Sep 15, 2016
The blockdev module is being slowly deprecated and its functions moved to to the disk module instead. There is a test for resize2fs in the blockdev_test file in the 2015.8 branch (which matches the resize2fs function in the blockdev module), but this function was moved to the disk file in 2016.3. The test was never moved over. I discovered this during a merge forward in saltstack#36344. This PR adds the test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted to work with the disk module accordingly.
rallytime
pushed a commit
that referenced
this pull request
Sep 15, 2016
The blockdev module is being slowly deprecated and its functions moved to to the disk module instead. There is a test for resize2fs in the blockdev_test file in the 2015.8 branch (which matches the resize2fs function in the blockdev module), but this function was moved to the disk file in 2016.3. The test was never moved over. I discovered this during a merge forward in #36344. This PR adds the test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted to work with the disk module accordingly.
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.
Conflicts: