Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi e631940a2f [maven-release-plugin] prepare for next development iteration 2014-10-26 20:29:37 -07:00
Kohsuke Kawaguchi 36cd30b2da [maven-release-plugin] prepare release jenkins-1.586 jenkins-1.586 2014-10-26 20:29:37 -07:00
Jesse Glick 0434a2ac4a readFromOffset needed to be adjusted too. 2014-10-26 15:47:47 -07:00
Jesse Glick 48beb9135f Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	pom.xml
2014-10-26 15:27:59 -07:00
Jesse Glick a1ff122050 Merge branch 'security-rc' into SECURITY-144-rc 2014-10-26 15:26:44 -07:00
Jesse Glick 3a7e170555 Merge branch 'security' into security-rc
Conflicts:
	pom.xml
2014-10-26 15:25:45 -07:00
Jesse Glick b64dfc9599 Merge branch 'security-stable-1.580' into SECURITY-144-stable-1.580 2014-10-26 15:25:21 -07:00
Jesse Glick 687598888d Merge branch 'security' into security-stable-1.580
Conflicts:
	pom.xml
2014-10-26 15:24:12 -07:00
Jesse Glick 16719ced46 Merge branch 'stable-1.580' into security-stable-1.580 2014-10-26 15:23:57 -07:00
CloudBees DEV@Cloud 1671c9e63a Merge commit '9b36e2ae8dbbd2a7ab0d9d4bc9e24e305e33ecbc' builds/285 2014-10-26 22:22:28 +00:00
Kohsuke Kawaguchi 9b36e2ae8d [FIXED JENKINS-25314]
The original fix was made in 0c3d67097a.
In this fix, I'm also moving the code that creates LeftItem.

It makes no sense that there's Item.cancel(Queue) and Queue.cancel(Item)
and they do different things!
changes/285
2014-10-26 15:20:38 -07:00
Kohsuke Kawaguchi 2394c0cd0e [FIXED JENKINS-18366] Winstone is now powered by Jetty
(cherry picked from commit b19f4650d7)

Conflicts:
	changelog.html
	war/pom.xml
2014-10-26 15:12:50 -07:00
CloudBees DEV@Cloud 6f9fc7d9b5 Merge REMERGE_HEAD into HEAD 2014-10-26 21:40:21 +00:00
Jesse Glick 300b6fa519 Forgotten @since. builds/284 changes/284 2014-10-26 13:58:40 -07:00
Jesse Glick f0658e233d Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
2014-10-26 13:55:39 -07:00
Jesse Glick 56b87d6d11 Merge branch 'security' into security-rc 2014-10-26 13:46:19 -07:00
Jesse Glick 2269703ee7 Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
Conflicts:
	pom.xml
2014-10-26 13:45:02 -07:00
Jesse Glick bc0f363227 Merge branch 'security-stable-1.580' into SECURITY-144-stable-1.580 2014-10-26 13:44:22 -07:00
Jesse Glick 0b25d25226 Merge branch 'security' into security-stable-1.580
Conflicts:
	war/pom.xml
2014-10-26 13:44:02 -07:00
Jesse Glick cbf972f575 Since callable.conf already whitelists AsyncInvoker, it is not necessary to force an update of the bundled maven-plugin. 2014-10-26 13:36:06 -07:00
Kohsuke Kawaguchi b4a9671c27 Integrated the newest Stapler version
In particular, this includes pull request #39 from Matt that handles
'$class'
builds/283 changes/283
2014-10-26 13:35:49 -07:00
Jesse Glick 4f24a0274f [JENKINS-24527] Noting merge of #1442. 2014-10-25 18:36:27 -07:00
Craig Rodrigues 6d3d43275f [FIXED JENKINS-24527] Update jna-posix to 1.0.3-jenkins-1 which uses JNA 4.1 2014-10-25 17:19:42 -07:00
Jesse Glick 12f5dec0ed junit 1.2-beta-3 builds/282 changes/282 2014-10-25 15:39:08 -07:00
Jesse Glick 2f8e2684af Merge pull request #1441 from mattmoor/upstream-javadoc
Change the javadoc of UpstreamCause to be more accurate...
2014-10-25 12:19:59 -04:00
Matt Moore 6ceb24cbd9 Change the javadoc of UpstreamCause to be more accurate (the upstream build need not be complete) 2014-10-25 08:54:11 -07:00
N Nachiappan dc547cf297 move config file check as part of loading job to do it in multithread fashion than in a single thread 2014-10-24 14:06:42 -07:00
Daniel Beck 16509dc22c [FIXED JENKINS-15252] Explain problems with CSRF protection 2014-10-24 15:01:56 +02:00
James Nord e135651539 [FIXED JENKINS-25280] Failed tests do not get displayed properly in the overview
there is no such mothod getFullDisplayName in a TestObject - only getDisplayName

Change-Id: Idd454be00a22ee3c93f661a3ee3ae322a25c271d
2014-10-23 17:03:26 +01:00
Jesse Glick 90292ed28a Null safety.
Observed in a test against 1.480:
… hudson.model.Executor run
SEVERE: Unexpected executor death
java.lang.NullPointerException
	at hudson.model.Computer.getNode(Computer.java:473)
	at hudson.slaves.SlaveComputer.getNode(SlaveComputer.java:177)
	at hudson.slaves.SlaveComputer.getRetentionStrategy(SlaveComputer.java:609)
	at hudson.slaves.SlaveComputer.taskCompleted(SlaveComputer.java:285)
	at hudson.model.queue.WorkUnitContext.synchronizeEnd(WorkUnitContext.java:140)
	at hudson.model.Executor.run(Executor.java:253)
builds/281 changes/281
2014-10-21 11:42:11 -04:00
Kohsuke Kawaguchi 94590fdd69 [JENKINS-25169] integrated the fix for POODLE
(cherry picked from commit 1351b18e42)

Conflicts:
	war/pom.xml
2014-10-20 13:17:21 -04:00
Jesse Glick 8c06d5fb07 If not enabled by default, need to change wording. 2014-10-20 10:05:49 -04:00
Jesse Glick 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04:00
Kohsuke Kawaguchi 0fa32eac4e the trunk is toward 1.587-SNAPSHOT 2014-10-19 21:51:18 -07:00
Kohsuke Kawaguchi c7369f2cd6 creating an RC branch 2014-10-19 21:51:14 -07:00
Kohsuke Kawaguchi de6515fab8 merged back the RC branch 2014-10-19 21:50:12 -07:00
Kohsuke Kawaguchi b2fe53aac9 updated changelog as a part of the release 2014-10-19 21:50:09 -07:00
Kohsuke Kawaguchi 8e0e584684 updated changelog for release 2014-10-19 20:10:09 -07:00
Kohsuke Kawaguchi 09d4defec3 [maven-release-plugin] prepare for next development iteration 2014-10-19 20:03:53 -07:00
Kohsuke Kawaguchi 80e79b2af0 [maven-release-plugin] prepare release jenkins-1.585 jenkins-1.585 2014-10-19 20:03:52 -07:00
Kohsuke Kawaguchi 2820dc723c [JENKINS-25169]
Integrating 2.8 to really ensure SSLv2 is off (even when JDK supports
that, and we haven't found any JDKs that do that)
2014-10-19 19:43:16 -07:00
Oleg Nenashev 6819a620c0 Noting #1411
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-10-19 23:47:35 +04:00
Oleg Nenashev e80fa118aa Merge pull request #1411 from synopsys-arc-oss/JENKINS-19017
[FIXED JENKINS-19017] - FileParameter - Handle non-null file parameters as different values
2014-10-19 23:28:14 +04:00
Kohsuke Kawaguchi e70601482a Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580 2014-10-18 22:43:12 -07:00
Kohsuke Kawaguchi b2d5cd5162 Integtrating a new version of credentials plugin.
This version fixes a test failure in 1.580.1
2014-10-18 22:42:28 -07:00
Kohsuke Kawaguchi b4c2a1392b Now that the default is off, test has to activate this explicitly 2014-10-18 22:42:08 -07:00
Kohsuke Kawaguchi ae181567a8 Merge remote-tracking branch 'community/stable-1.580' into SECURITY-144-stable-1.580 1.580.1-rc1 2014-10-18 20:49:51 -07:00
Kohsuke Kawaguchi 1351b18e42 [JENKINS-25169] integrated the fix for POODLE 2014-10-18 20:48:50 -07:00
Kohsuke Kawaguchi 4ab018a078 Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580 2014-10-18 20:30:28 -07:00
Kohsuke Kawaguchi 8632efc35f Allowing (and encouraging) rules in config file to use '/' as separator.
Based on comments from Daniel Beck and Jesse Glick in 37a3dda
2014-10-18 20:03:38 -07:00