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

Backport changes from 2016.3 #31930

Merged
merged 5 commits into from
Mar 16, 2016
Merged

Backport changes from 2016.3 #31930

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d571f3b
Backport PR#31601
cro Mar 16, 2016
9de9b9e
Missin import
cro Mar 1, 2016
3c81855
Lint.
cro Mar 2, 2016
916ef26
Remove .orig file mistakenly added, reformat example.
cro Mar 3, 2016
aa9a288
Add these files back in
cro Mar 16, 2016
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
Prev Previous commit
Next Next commit
Lint.
  • Loading branch information
@cro
cro committed Mar 16, 2016
commit 3c8185571d4e0def50f66c62d68a9fa252b85ead
1 change: 0 additions & 1 deletion salt/modules/service.py
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@

# Import python libs
import os
import salt.utils

__func_alias__ = {
'reload_': 'reload'