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

add back try/except #2854

Merged
merged 1 commit into from
Dec 10, 2012
Merged

add back try/except #2854

merged 1 commit into from
Dec 10, 2012

Conversation

terminalmage
Copy link
Contributor

This was removed in the merge conflict resolution from #2837.

@terminalmage terminalmage mentioned this pull request Dec 10, 2012
Merged
thatch45 added a commit that referenced this pull request Dec 10, 2012
@thatch45
Merge pull request #2854 from archtaku/develop
82a08cb 
add back try/except
@thatch45 thatch45 merged commit 82a08cb into saltstack:develop Dec 10, 2012
@thatch45
Copy link
Contributor

Thanks! Seems I merged the wrong block :)

@terminalmage
Copy link
Contributor Author

No prob. I figured it would be confusing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@terminalmage @thatch45