OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Glick e410313306 Supporting blank lines & comments in split-plugins.txt & split-plugin-cycles.txt. 2017-10-27 13:41:26 -04:00
Jesse Glick 6c78da03bb Merge branch 'master' into metadata-JENKINS-47634 2017-10-27 12:42:49 -04:00
James Nord 96b016986b Merge pull request #3033 from jtnord/JENKINS-37062 
[JENKINS-37062] incorporate changes from stapler 1.253 (servlet 3.1)
 2017-10-27 16:08:38 +01:00
Jesse Glick aebb3b235b Clarifying relation between host/port variables as used by Remoting-based CLI vs. other protocol clients. 2017-10-27 10:37:46 -04:00
Oleg Nenashev 4b566a1ef0 Merge pull request #3105 from suren-jenkins/suren-zh 
Add Chinese translation
 2017-10-27 01:19:12 +02:00
Oleg Nenashev 7dc9143ce2 [JENKINS-27026] - Update SSHD Module from 2.0 to 2.3 to pick the fix 2017-10-27 00:43:47 +02:00
Jesse Glick 1a399a1c9e [JENKINS-47634] Move metadata about split plugins into a resource file so that plugin-compat-tester need not be manually synchronized. 2017-10-25 14:54:51 -04:00
James Nord 2a92d7cadb [JENKINS-37062] fix some typos in comments and update others. 
There was a few typos in comments that have been addressed.
Also update the comment about the servlet fudge in plugin-pom
 2017-10-25 18:12:24 +01:00
James Nord 136063fa79 Merge remote-tracking branch 'origin/master' into JENKINS-37062 2017-10-25 18:00:58 +01:00
James Nord cafbaecf87 [JENKINS-37062] add a comment for those not familiar with version ranges 
Add a comment about what <version>[x]</version> means as not everyone is
familiar with its syntax.
 2017-10-25 17:59:53 +01:00
James Nord b4ce632e9f [JENKINS-37062] update pom comment 
servlet-api is not a plugin :)
 2017-10-25 17:32:48 +01:00
Jesse Glick b778bd0050 Update commons-codec to 1.9. 2017-10-25 17:32:08 +01:00
James Nord 321fe586ba [JENKINS-37062] update to release version of stapler 1.253 2017-10-25 17:25:53 +01:00
Oleg Nenashev bcbd5ba56a Merge pull request #3104 from suren-jenkins/suren-plugin-manager-zh 
Add Chinese translation fro PluginManager
 2017-10-25 15:31:21 +02:00
Jesse Glick 474a9891a3 Merge branch 'security-stable-2.73' into security-master 2017-10-24 12:02:35 -04:00
Jesse Glick 4d67aea8aa Merge branch 'security-stable-2.60' into security-stable-2.73 2017-10-24 12:02:24 -04:00
Jesse Glick 44a7a871e4 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-10-24 12:02:12 -04:00
Daniel Beck f67068170b [SECURITY-641] Escape autocompletion suggestions 2017-10-24 12:01:03 -04:00
Jesse Glick e16671b20f Merge branch 'security-stable-2.73' into security-master 2017-10-23 09:09:21 -04:00
Jesse Glick f266a7f6aa Merge commit '790068c8486cdd4741336f9d61de72a9a6537a30' into security-master 2017-10-23 09:09:19 -04:00
Jesse Glick 9b639b1aeb Merge branch 'stable-2.73' 2017-10-23 09:06:33 -04:00
Jesse Glick eb2f766908 Merge commit '790068c8486cdd4741336f9d61de72a9a6537a30' of git://github.com/jenkinsci/jenkins 2017-10-23 09:06:28 -04:00
Jesse Glick ae24a7924c Merge branch 'stable-2.73' into security-stable-2.73 2017-10-23 09:06:13 -04:00
Daniel Beck a70a736b33 Merge pull request #3037 from thomasgl-orange/AbstractCommandInstaller-textarea-checkMethod-POST 
make POST requests when checking AbstractCommandInstaller.command

(cherry picked from commit 016fa37aa6)
 2017-10-23 10:50:08 +02:00
Oleg Nenashev 84bde074cf Merge pull request #3093 from dwnusbaum/JENKINS-47448 
[JENKINS-47448] Fix JDKInstaller for downloads requiring an Oracle login

(cherry picked from commit 136fe8255e)
 2017-10-23 10:47:18 +02:00
Martin Nowak ebf4e6ed29 [JENKINS-47056] nested JNLPLauncher settings ignored 
- fixed by stripping off DelegatedComputerLaunchers and
  ComputerLauncherFilters when rendering slave-agent.jnlp

(cherry picked from commit 257cc238fb)
 2017-10-23 10:30:02 +02:00
Jesse Glick dda5903c99 [FIXED JENKINS-46659] Avoid Jetty timeouts by sending a ping-like packet every 10s while a CLI command is running. 
(cherry picked from commit dc06c3f03b)
 2017-10-23 10:22:31 +02:00
Oliver Gondža 06b0cd637c [JENKINS-46680] Disconnect computer on ping timeout (#3005) 
* [JENKINS-46680] Reproduce in unittest

* [FIX JENKINS-46680] Reset SlaveComputer channel before closing it on ping timeout

* [JENKINS-46680] Attach channel termination offline cause on ping timeouts

(cherry picked from commit dbb5e443b9)
 2017-10-23 10:16:27 +02:00
Kohsuke Kawaguchi 790068c848 [maven-release-plugin] prepare for next development iteration 2017-10-22 17:56:23 -07:00
Kohsuke Kawaguchi 8c0ea07d5d [maven-release-plugin] prepare release jenkins-2.86 jenkins-2.86 2017-10-22 17:56:23 -07:00
Oleg Nenashev a5388c9a2f Merge pull request #3091 from jglick/Memoizer 
Deprecating Memoizer as there is a better replacement in Java 8
 2017-10-22 11:18:36 +02:00
Oleg Nenashev b3d20446dc Merge pull request #3098 from jglick/QueueTest.taskEquality 
QueueTest.taskEquality was flaky
 2017-10-22 11:16:39 +02:00
Emilio Escobar a82c4fcc51 [JENKINS-47500] Secret.decrypt launches ArrayIndexOutOfBoundsException when data is "{}" (#3097) 
* [JENKINS-47500] unit test for JENKINS-47500 bug

* [JENKINS-47500] return null when the data is just {}

* [JENKINS-47500] added more cases
 2017-10-22 00:03:45 +02:00
surenpi e5e229f997 Add Chinese translation 2017-10-21 19:21:31 +08:00
surenpi 768bd1dbf4 Add Chinese translation fro PluginManager 2017-10-21 18:51:12 +08:00
Oleg Nenashev 136fe8255e Merge pull request #3093 from dwnusbaum/JENKINS-47448 
[JENKINS-47448] Fix JDKInstaller for downloads requiring an Oracle login
 2017-10-21 09:46:40 +02:00
Oleg Nenashev 987b604351 Merge pull request #3085 from suren-jenkins/suren-basic-zh 
Add view or job related Chinese translation
 2017-10-21 09:38:16 +02:00
Wadeck Follonier 9c5c14a9fb Add a default implementation for SecurityListener (#3077) 
* - add a default implementation doing nothing for the different event on SecurityListener.

* - remove the useless non-implemented method in this inner class.
 2017-10-21 09:37:19 +02:00
Jesse Glick 5e6b1050b2 Merge pull request #3099 from jglick/getCauseOfBlockage-JENKINS-47517 
[JENKINS-47517] Revert the change to the default behavior of Queue.Task.getCauseOfBlockage
 2017-10-20 18:02:40 -04:00
Oleg Nenashev 80294c42be Merge pull request #3096 from jglick/JnlpAccessWithSecuredHudsonTest 
Updating JnlpAccessWithSecuredHudsonTest to JenkinsRule
 2017-10-20 19:05:01 +02:00
Andrew Bayer 0d9beb20ab [FIXED JENKINS-43834] Stop using deprecated ABORT permission 
This is the only place it's actually referenced, so let's get rid of
it entirely.
 2017-10-20 12:55:02 +02:00
Oleg Nenashev 5d565cce10 Merge pull request #3068 from suren-jenkins/suren-zh 
Add Chinese translation
 2017-10-20 09:08:36 +02:00
Jesse Glick 50eb7f1c56 Slave.JnlpJar.getURL did not work in some modes when core had a snapshot dependency on Remoting. (#3069) 2017-10-20 09:03:42 +02:00
Oleg Nenashev 6860670f6d Merge pull request #3090 from jglick/NPE-JENKINS-47455 
[JENKINS-47455] Null safety relating to offline nodes
 2017-10-20 09:02:43 +02:00
Jesse Glick 19714f2018 Deprecate isBuildBlocked & getWhyBlocked in favor of getCauseOfBlockage, which you needed to implement anyway. 2017-10-19 13:06:35 -04:00
Jesse Glick a9246c2887 Merge branch 'security-stable-2.73' into security-master 2017-10-19 12:28:51 -04:00
Jesse Glick a2491e323b Merge branch 'security-stable-2.60' into security-stable-2.73 2017-10-19 12:28:07 -04:00
Jesse Glick 87b7ba7d31 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-10-19 12:19:45 -04:00
Rebecca Ysteboe 566a8ddb88 [SECURITY-499] Sanitize user id <-> filename conversion 2017-10-19 12:14:51 -04:00
Daniel Beck 3c7c582ec3 Merge pull request #3081 from dwnusbaum/JENKINS-36282 
[JENKINS-36282] Add link to cc.xml?recursive from build history page
 2017-10-19 17:52:28 +02:00