Correctly merged #8, fixes #22 #23
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
oleg-nenashev
changed the title
|
Yes, this PR seems to integrate #8 correctly. |
oleg-nenashev
added a commit
to oleg-nenashev/jenkins
that referenced
this pull request
Nov 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
oleg-nenashev
added a commit
to jenkinsci/jenkins
that referenced
this pull request
Nov 27, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
olivergondza
pushed a commit
to jenkinsci/jenkins
that referenced
this pull request
Dec 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12)) (cherry picked from commit 63c2f6c)
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.
Correct remerge of #8, see #22