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.

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

Work around upstream pygit2 bug #29059

Merged
merged 1 commit into from Nov 25, 2015

Conversation

Projects
None yet
2 participants
@terminalmage
Member

terminalmage commented Nov 19, 2015

See #28072 and libgit2/pygit2#583.

Fixes #28072.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 19, 2015

Contributor

@terminalmage The linter seems unhappy. Could you please take a look?

Contributor

cachedout commented Nov 19, 2015

@terminalmage The linter seems unhappy. Could you please take a look?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 24, 2015

Contributor

@terminalmage This no longer merges cleanly. Could you take a peek please?

Contributor

cachedout commented Nov 24, 2015

@terminalmage This no longer merges cleanly. Could you take a peek please?

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Nov 24, 2015

Member

Looking, probably no longer merges cleanly because of the other PR that was just merged.

Member

terminalmage commented Nov 24, 2015

Looking, probably no longer merges cleanly because of the other PR that was just merged.

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Nov 24, 2015

Member

Rebased.

Member

terminalmage commented Nov 24, 2015

Rebased.

cachedout added a commit that referenced this pull request Nov 25, 2015

Merge pull request #29059 from terminalmage/issue28072
Work around upstream pygit2 bug

@cachedout cachedout merged commit 0c0e15d into saltstack:2015.8 Nov 25, 2015

4 of 6 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #191 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11479 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2546 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11187 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10016 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue28072 branch Jan 12, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment