Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi d50dc367f5 Merge remote-tracking branch 'origin/master' 2017-10-11 09:34:07 -07:00
Jesse Glick eb5b40e25c Suppressing flaky shouldBeAbleToBlockFlyweightTaskAtTheLastMinute. 2017-10-10 03:06:10 -04:00
Kohsuke Kawaguchi 8ec2510bde [maven-release-plugin] prepare for next development iteration 2017-10-09 12:19:09 -07:00
Kohsuke Kawaguchi 2e2c70e3d2 [maven-release-plugin] prepare release jenkins-2.73.2 jenkins-2.73.2 2017-10-09 12:19:08 -07:00
Kohsuke Kawaguchi 11ce22f1aa [maven-release-plugin] prepare for next development iteration 2017-10-09 10:55:50 -07:00
Kohsuke Kawaguchi 84956ca13d [maven-release-plugin] prepare release jenkins-2.84 jenkins-2.84 2017-10-09 10:55:49 -07:00
Jesse Glick 61ff5e4afe Merge branch 'security-stable-2.73' into security-master 2017-10-09 10:10:53 -04:00
Jesse Glick 4be1d4ab47 Merge commit '21aa900599a9d40c572048add7b2654b58990b33' into security-master 2017-10-09 10:10:17 -04:00
Jesse Glick 49aba2f76e Merge branch 'stable-2.73' 2017-10-09 10:09:34 -04:00
Jesse Glick 91f9171fbe Merge commit '21aa900599a9d40c572048add7b2654b58990b33' of git://github.com/jenkinsci/jenkins 2017-10-09 10:08:46 -04:00
Jesse Glick 4d9fdbc388 Merge branch 'stable-2.73' into security-stable-2.73 2017-10-09 09:36:24 -04:00
Jesse Glick 085ea948e7 Merge branch 'stable-2.73' of git://github.com/jenkinsci/jenkins into stable-2.73 2017-10-09 09:27:48 -04:00
Jesse Glick f81af78670 Merge pull request #3055 from jglick/QueueTest.shouldBeAbleToBlockFlyweightTaskAtTheLastMinute
Try to avoid test hangs
2017-10-09 09:26:30 -04:00
surenpi 3c09876079 Add Chinese translation 2017-10-09 18:57:37 +08:00
Wadeck Follonier cbd4796474 - add javadoc @since tag 2017-10-09 11:25:40 +02:00
Kanstantsin Shautsou 1f476da2e1 Don't use onloadable things in remoting mkdirs calls.
mkdirs do remoting call by creating anonymous class.
Remoting on remote side must load outer FilePath class with imports.
FilePath had SystemProperties OnMaster.
2017-10-09 11:29:41 +03:00
Wadeck Follonier 37127dde36 Like mentioned in the previous comment in code, the method should be used in the other project, like authorize-project that require a field to be set as critical.
As discussed with Jesse and Oleg on Oct. 5, I can un-restrict the call to this method by plugins.
2017-10-09 10:12:43 +02:00
Kohsuke Kawaguchi 21aa900599 [maven-release-plugin] prepare for next development iteration 2017-10-08 11:25:06 -07:00
Kohsuke Kawaguchi 8a417366fd [maven-release-plugin] prepare release jenkins-2.83 jenkins-2.83 2017-10-08 11:25:06 -07:00
Oleg Nenashev 2073d193a1 Merge pull request #3034 from MartinNowak/jenkins_47056
[Jenkins-47056] nested JNLPLauncher settings ignored
2017-10-08 07:17:16 +02:00
surenpi 8451a7acc8 Add Chinese translation (#3056)
* Add Chinese translation

* change license

* Add chinese translation for about jenkins

* Add ProxyConfiguration chinese translation
2017-10-08 07:14:54 +02:00
Martin Nowak 257cc238fb [JENKINS-47056] nested JNLPLauncher settings ignored
- fixed by stripping off DelegatedComputerLaunchers and
  ComputerLauncherFilters when rendering slave-agent.jnlp
2017-10-07 14:49:21 +02:00
Martin Nowak 2fe15145af add missing @Test attribute 2017-10-07 14:49:21 +02:00
Oleg Nenashev c835208d36 Disable the flaky AgentProtocolTest#testShouldNotDisableProtocolsForMigratedInstances() 2017-10-06 16:18:19 +02:00
Oliver Gondža 57406d1e4e Picking the proper version of remoting 2017-10-06 14:35:48 +02:00
Daniel Beck 8d85b832ef Merge pull request #3062 from jglick/revert-sshd
Reverting SSHD update
2017-10-06 12:24:21 +02:00
Oleg Nenashev 216292f9a5 Merge pull request #3041 from Jimilian/fix_race_condition_in_queue_test
Fix the race condtion in QueueTaskDispatcherTest
2017-10-06 12:09:16 +02:00
Oleg Nenashev 3cd3566db9 Merge pull request #3059 from oleg-nenashev/docs/ContributorGuide
Jenkins Core Contribution Guidelines
2017-10-06 00:13:02 +02:00
Jesse Glick 0fac1b880b Revert "Merge pull request #3031 from olivergondza/async-sshd"
This reverts commit 4907eba619, reversing
changes made to a2ac53bc30.
2017-10-05 14:17:24 -04:00
Oleg Nenashev 85319d0a57 [JENKINS-38711, JENKINS-47132] - Update Remoting to 3.13 2017-10-05 19:50:58 +02:00
Oleg Nenashev 4907eba619 Merge pull request #3031 from olivergondza/async-sshd
Launch SSHD service asynchronously
2017-10-05 08:06:21 +02:00
Oleg Nenashev 2bd8cb7e39 Merge pull request #6 from bitwiseman/pvp/oleg-nenshev/docs/ContributorGuide
Added a number of tweaks and fixes
2017-10-04 23:15:15 +02:00
Liam Newman 67ad416d70 Added a number of tweaks and fixes 2017-10-04 13:54:01 -07:00
Oliver Gondža a2ac53bc30 Merge pull request #3040 from olivergondza/kill-update-node-time-tracking
Do not clutter logs with computer update times
2017-10-04 20:13:15 +02:00
Jesse Glick c08ce3a9e6 Merge branch 'master' into security-master 2017-10-04 13:51:04 -04:00
Jesse Glick 714f3af4b8 Merge branch 'master' of git://github.com/jenkinsci/jenkins 2017-10-04 13:50:26 -04:00
Jesse Glick 026b3b70d9 Merge branch 'master' into QueueTest.shouldBeAbleToBlockFlyweightTaskAtTheLastMinute 2017-10-04 13:39:29 -04:00
Oleg Nenashev b0d58aa1cb CONTRIBUTING: Clarify the Copyright section after the feedback from @daniel-beck 2017-10-04 13:59:07 +02:00
Oleg Nenashev be34a4fc8c CONTRIBUTING: Add infor about copyrights + links 2017-10-04 12:31:46 +02:00
Oleg Nenashev d790049c0c CONTRIBUTING: Add information about contributing to the Jenkins core. 2017-10-04 12:19:20 +02:00
Daniel Beck 016fa37aa6 Merge pull request #3037 from thomasgl-orange/AbstractCommandInstaller-textarea-checkMethod-POST
make POST requests when checking AbstractCommandInstaller.command
2017-10-04 09:20:47 +02:00
Daniel Beck 4109c5b327 Merge pull request #3046 from daniel-beck/JENKINS-32623
[JENKINS-32623] Use real URL for user
2017-10-02 23:44:23 +02:00
Oliver Gondža 9d024d276b Do not clutter logs with computer update times 2017-10-02 16:55:43 +02:00
Kohsuke Kawaguchi f3398eabbc [maven-release-plugin] prepare for next development iteration 2017-10-01 16:36:49 -07:00
Kohsuke Kawaguchi e94c293f12 [maven-release-plugin] prepare release jenkins-2.82 jenkins-2.82 2017-10-01 16:36:49 -07:00
Daniel Beck 576f5b5c0d Merge pull request #3049 from daniel-beck/JENKINS-40344
[JENKINS-40344] Don't log warning for invalid crumb from anon
2017-10-01 20:03:32 +02:00
Baptiste Mathus be7ac438e0 Merge pull request #3058 from batmat/JENKINS-44052-followup
[JENKINS-44052] Small followups on #3043
2017-10-01 17:20:20 +02:00
Baptiste Mathus 1ca5da2258 Add missing @since TODO 2017-10-01 15:02:52 +02:00
Baptiste Mathus 3149ca8135 Fix wrong Javadoc
Reported by Jesse during review, but I forgot to fix it before
the merge.
2017-10-01 13:29:26 +02:00
Baptiste Mathus 61016e1a84 Add @Issue to reference JENKINS-44052 2017-10-01 13:29:17 +02:00