Commit Graph
32590 Commits
Author SHA1 Message Date
Jennifer Briden 359df30c2a Merge pull request #2 from jennbriden/rename-build-agent
Changed references to "slave" and "slaves" to "agent" and "agents"
2018-05-15 17:21:10 +10:00
Jenn Briden 434135ef20 Changed references to "slave" and "slaves" to "agent" and "agents" 2018-05-14 22:04:47 -07:00
Kohsuke Kawaguchi cdda62c35a mvn incrementals:reincrementalify 2018-05-14 18:18:44 -07:00
Kohsuke Kawaguchi 84e0c40349 [maven-release-plugin] prepare for next development iteration 2018-05-14 12:45:22 -07:00
Kohsuke Kawaguchi 261ddc1c9a [maven-release-plugin] prepare release jenkins-2.122 jenkins-2.122 2018-05-14 12:45:22 -07:00
Kohsuke Kawaguchi 904e46cd5f Merge pull request #3441 from jglick/flatten-snafu
Apparently #3431 broke the Maven release?
2018-05-15 06:39:17 +12:00
Jesse Glick 82f90da4dd Picking up https://github.com/jenkinsci/pom/pull/25. 2018-05-14 14:35:17 -04:00
Jesse Glick 29b69b3554 Apparently #3431 broke the Maven release? 2018-05-14 12:40:16 -04:00
Oliver Gondža 74c5b680ee Reference packaging branch 2018-05-14 10:38:37 +02:00
Oleg Nenashev 9e5ccb0049 Merge pull request #3440 from LinuxSuRen/fix/global-sec-config-zh-miss
Fix incorrect i18n resources
2018-05-14 10:03:54 +02:00
Kohsuke Kawaguchi cea7e83f02 Merge pull request #3433 from kohsuke/stable-2.107
Capture the corresponding branch/tag in jenkinsci/packaging to be used.
2018-05-14 18:11:24 +12:00
suren 5b52480559 Fix incorrect i18n resources 2018-05-14 10:06:15 +08:00
Oleg Nenashev 922617509e [JENKINS-51179] - Check type of the loaded object when loading fingerprints 2018-05-14 00:25:24 +02:00
Oleg Nenashev cc9425039a [JENKINS-51179] - Reproduce the issue in Test 2018-05-14 00:24:54 +02:00
Oleg Nenashev 68ded5c155 Merge pull request #3423 from LinuxSuRen/translate/new-guy
Add Chinese translation for setupWizardConfigureInstance page
2018-05-12 16:35:59 +02:00
Oleg Nenashev 880cdb3859 Merge pull request #3434 from jsoref/patch-1
Remove stray space before period
2018-05-12 16:34:00 +02:00
Kohsuke Kawaguchi fe070f10ff Merge pull request #3432 from kohsuke/master
Capture the corresponding branch/tag in jenkinsci/packaging to be used.
2018-05-12 15:28:16 +12:00
Jesse Glick 699ae01737 Merge pull request #3430 from jglick/no-build.version
Remove ${build.version} property in favor of ${project.version}
2018-05-11 16:39:30 -04:00
Jesse Glick 41c2c49443 Merge pull request #3431 from jglick/flatten
[JENKINS-51247] Simplified usage of flatten-maven-plugin
2018-05-11 16:39:22 -04:00
Jesse Glick 40433c2dd6 Merge branch 'master' into no-build.version 2018-05-11 14:38:33 -04:00
Jesse Glick 86cfcba479 No need to be touching .mvn/extensions.xml here. 2018-05-11 14:38:32 -04:00
Jesse Glick 833fda4c0f Updating with trunk and releases. 2018-05-11 14:36:57 -04:00
Josh Soref 91ddc6fca7 Queue API: use fancy quotes around nodes/labels/projects 2018-05-11 14:22:53 -04:00
Josh Soref e3d5bb9ddf Queue API: do not end status with period
None of the other messages do...
2018-05-11 13:50:25 -04:00
Jesse Glick 72f4a592d2 Merge pull request #3435 from jglick/relocate-JENKINS-51187
[JENKINS-51187] Moving git-changelist-maven-extension into incrementals-tools
2018-05-10 16:57:08 -04:00
Jesse Glick 2b4288155a [JENKINS-51187] Moving git-changelist-maven-extension into incrementals-tools. 2018-05-10 14:24:08 -04:00
Jesse Glick 6bb85ec23b Merge pull request #3428 from jglick/perf-JENKINS-51205
[JENKINS-51205] Improve performance of /pluginManager/available service
2018-05-10 12:51:22 -04:00
Josh Soref b043385d47 Remove stray space before period 2018-05-10 12:26:34 -04:00
Jesse Glick 51e0da8ed2 [JENKINS-51247] source:jar, not source:jar-no-fork 2018-05-10 10:35:51 -04:00
Oliver Gondža fbadb6174a Bump ATH version to latest to consume the timeout fix
(cherry picked from commit 901894c1be)
2018-05-10 13:52:28 +02:00
Oliver Gondža 9506c86f15 Towards 2.121.1 2018-05-10 13:06:32 +02:00
Kohsuke Kawaguchi c5d0ce0044 Capture the corresponding branch/tag in jenkinsci/packaging to be used. 2018-05-10 08:57:10 +12:00
Kohsuke Kawaguchi 1299fc6046 Capture the corresponding branch/tag in jenkinsci/packaging to be used. 2018-05-10 08:55:05 +12:00
Jesse Glick bc80a66ce1 Simplified usage of flatten-maven-plugin. 2018-05-09 16:43:17 -04:00
Jesse Glick 0268cc9929 Remove ${build.version} property in favor of ${project.version}. 2018-05-09 15:17:02 -04:00
Oleg Nenashev d004eea0ca Merge pull request #3429 from jglick/revision
Fix revision after bad merge
2018-05-09 20:31:40 +02:00
Jesse Glick 67b1328385 Fix revision. 2018-05-09 14:17:12 -04:00
Oliver Gondža 901894c1be Bump ATH version to latest to consume the timeout fix 2018-05-09 12:57:03 +02:00
Kohsuke Kawaguchi 91e1cf2d3e Merge remote-tracking branch 'origin/master' 2018-05-09 02:44:41 -07:00
Jesse Glick 3b61b96119 [JENKINS-51205] Improve performance of /pluginManager/available service. 2018-05-08 12:04:18 -04:00
aviadatsnyk e7cc06e745 handle absolute paths correctly when unzipping
When checking that an unzipped file does not break out of the target directory - this handles '..' in absolute paths correctly, where the previous implementation might not.
2018-05-08 16:18:14 +03:00
Jesse Glick afb71c005a Merge pull request #3427 from jglick/reincrementalify-robustness
Avoid CI failures pending reincrementalifization
2018-05-07 17:53:01 -04:00
Kohsuke Kawaguchi 9bc3aa68b1 [maven-release-plugin] prepare release jenkins-2.121 jenkins-2.121 2018-05-07 12:09:24 -07:00
Kohsuke Kawaguchi e1132fd4ed [maven-release-plugin] prepare for next development iteration 2018-05-07 12:09:24 -07:00
Kohsuke Kawaguchi c6c008e064 [maven-release-plugin] prepare for next development iteration 2018-05-07 11:00:10 -07:00
Kohsuke Kawaguchi 5e4d47be1b [maven-release-plugin] prepare release jenkins-2.107.3 jenkins-2.107.3 2018-05-07 11:00:10 -07:00
Jesse Glick e216995ee0 Avoid CI failures pending reincrementalifization. 2018-05-07 09:39:26 -04:00
Daniel Beck e992e1153b Merge commit '7250d8b875366ae90fa6aec13b5a5c86720e23a3' into security-master 2018-05-07 14:12:09 +02:00
Daniel Beck f35476ee9e Merge commit '7250d8b875366ae90fa6aec13b5a5c86720e23a3' of git://github.com/jenkinsci/jenkins 2018-05-07 14:10:37 +02:00
Jesse Glick b414e3f23b Reincrementalify core. (#3426)
* Reincrementalify core.

* Pick up released version
2018-05-07 13:50:19 +02:00