Branch: refs/heads/master
Home: https://github.com/jenkinsci/repository-connector-plugin
Commit: 119337383414a6a605dbbe5b6fa22043146a418c
https://github.com/jenkinsci/repository-connector-plugin/commit/119337383414a6a605dbbe5b6fa22043146a418c
Author: imod <[email protected]>
Date: 2017-10-31 (Tue, 31 Oct 2017)
Changed paths:
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/ArtifactResolver.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionLabel.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterDefinition.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterValue.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/Aether.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/ReleasedVersionRangeResolver.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/VersionRangeResultWithLatest.java
M
src/main/resources/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterDefinition/index.jelly
Log Message:
-----------
fix merge conflicts
Commit: a5935371ab6f9f99e4580a9ddd057a5468e855a8
https://github.com/jenkinsci/repository-connector-plugin/commit/a5935371ab6f9f99e4580a9ddd057a5468e855a8
Author: imod <[email protected]>
Date: 2017-10-31 (Tue, 31 Oct 2017)
Changed paths:
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/ArtifactResolver.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionLabel.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterDefinition.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterValue.java
M
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/Aether.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/ReleasedVersionRangeResolver.java
A
src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/VersionRangeResultWithLatest.java
M
src/main/resources/org/jvnet/hudson/plugins/repositoryconnector/VersionParameterDefinition/index.jelly
Log Message:
-----------
Merge branch 'fabdouglas-patch-3'
Compare:
https://github.com/jenkinsci/repository-connector-plugin/compare/017193b28b75...a5935371ab6f
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
