Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[master] Porting #52747 to master #54678

Merged
merged 3 commits into from
Dec 24, 2019
Merged

[master] Porting #52747 to master #54678

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a513cc
Porting PR #52747 to 2019.2.1
garethgreenaway Sep 19, 2019
ed89e41
Merge branch 'master' into 2019_2_1_port_52747
Sep 25, 2019
a82126e
Merge branch 'master' into 2019_2_1_port_52747
dwoz Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/unit/pillar/test_csvpillar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from tests.support.unit import TestCase
from tests.support.mock import patch, mock_open


# Import Salt Libs
import salt.pillar.csvpillar as csvpillar

Expand Down