Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 15674e4032 creating an RC branch 2014-04-20 19:25:11 -07:00
Kohsuke Kawaguchi 813fc3cfe3 merged back the RC branch 2014-04-20 18:18:41 -07:00
Kohsuke Kawaguchi 1e5e457a8e updated changelog as a part of the release 2014-04-20 18:18:37 -07:00
Fernando Boaglio 64fd84d23b pt_BR translation 2014-04-20 20:03:39 -03:00
Kohsuke Kawaguchi 7f9c44d304 updated changelog for release 2014-04-20 13:37:28 -07:00
Kohsuke Kawaguchi 83263e2127 [maven-release-plugin] prepare for next development iteration 2014-04-20 13:28:22 -07:00
Kohsuke Kawaguchi 0f24ea3ad5 [maven-release-plugin] prepare release jenkins-1.560 jenkins-1.560 2014-04-20 13:28:22 -07:00
Daniel Beck 14b6e10243 Noted #648, #737, #733, JENKINS-13546 2014-04-20 13:38:25 +02:00
Kohsuke Kawaguchi 8c37a311b8 Merge pull request #648
Excluded */empty.gif, which seem to be broken

Conflicts:
	war/src/main/webapp/images/title.png
2014-04-19 20:45:00 -07:00
Matthew Barr a08b16d281 Remove repo file from RPM. https://issues.jenkins-ci.org/browse/JENKINS-22690 2014-04-19 22:37:23 -04:00
Kohsuke Kawaguchi 16c395e32c [FIXED JENKINS-16846] 2014-04-19 18:31:49 -07:00
Kohsuke Kawaguchi d5c368dd8e Merge branch 'pull-714' 2014-04-19 18:31:09 -07:00
Kohsuke Kawaguchi 20347431ae [JENKINS-16846]
This is a much simpler fix
2014-04-19 18:30:52 -07:00
Kohsuke Kawaguchi 2bfc2bb199 [FIXED JENKINS-15178] Merged pull request #727 2014-04-19 16:55:37 -07:00
Kohsuke Kawaguchi 06348091cd Merge pull request #733
Conflicts:
	core/pom.xml
2014-04-19 16:51:28 -07:00
Kohsuke Kawaguchi 52b2571126 Merge pull request #737
Conflicts:
	core/src/main/java/hudson/model/UpdateCenter.java
2014-04-19 16:42:31 -07:00
Kohsuke Kawaguchi d1fb126b48 Massaging the fix by stevenpost
- coding style was not matching the rest of Jenkins
- IOUtils.closeQuietly is a lot more concise way of achieving the same
  thing.
- AtomicFileWriter.abort() does close, so no need to close it one more
  time.
2014-04-19 16:40:10 -07:00
Kohsuke Kawaguchi 1d5653a9f1 Merge pull request #742
Queue length has to count individual SubTask, so that heavy weight jobs
correctly provision required number of slaves through Cloud.
2014-04-19 16:27:45 -07:00
Kohsuke Kawaguchi 533cfe47d3 simplified 2014-04-19 16:26:22 -07:00
Kohsuke Kawaguchi 4192720f1f Unused code 2014-04-19 16:21:02 -07:00
Kohsuke Kawaguchi 680dd4a21a [FIXED JENKINS-13546]
Bringing this to the parity with ParameterizedJobMixIn.doBuild()

Instead of returning JSON, it returns "201 Created" and responds with the location of the queue item, through which the caller can track how it passes through the queue and eventually gets built/cancelled.

The approach in pull request #750 that relies on
AbstractProject.getQueueItem() is inherently unreliable, because
item can be immediately built before the JSON is rendered, or it might
corresponds to other queued items if the build supports concurrent
builds, etc.
2014-04-19 16:19:40 -07:00
Daniel Beck 5e9d59c625 Noted #877, #1095, #1125 2014-04-20 00:56:03 +02:00
Kohsuke Kawaguchi 1ce5d40c0c Merge branch 'master' of github.com:jenkinsci/jenkins 2014-04-19 15:51:06 -07:00
Kohsuke Kawaguchi 50cc4f0f5d [JENKINS-17510]
Massaging the pull request.

- Simplifying by reusing InterceptingExecutorService
- Not hiding the implementation class for better
  consistency with other ExecutorService impls in
  Jenkins.
2014-04-19 15:48:48 -07:00
Daniel Beck d5f4d9504e Merge pull request #1125 from daniel-beck/hide-dynamicload-when-updating
Don't offer install without restart unless it's possible.
2014-04-20 00:45:28 +02:00
Daniel Beck e2f22441fa Merge pull request #1095 from daniel-beck/computers-table
Minor changes to computers table status row
2014-04-20 00:42:13 +02:00
Kohsuke Kawaguchi da74cbfd6b Merge branch 'pull-766' 2014-04-19 15:40:24 -07:00
Daniel Beck eaf30ebed4 [FIXED JENKINS-22689] Show load statistics for master node 2014-04-20 00:30:17 +02:00
Kohsuke Kawaguchi f234c7bd75 Merge branch 'pull-877'
Conflicts:
	core/src/main/java/hudson/slaves/SlaveComputer.java
2014-04-19 15:23:53 -07:00
Daniel Beck b1be24a735 [FIXED JENKINS-22688] Made graph font explicit and configurable 2014-04-20 00:00:15 +02:00
Kohsuke Kawaguchi c3837b6c48 [FIXED JENKINS-20974]
Merged pull request #1062
2014-04-19 14:05:51 -07:00
Kohsuke Kawaguchi 5b4440a2b8 [JENKINS-20974] It's more composeable to just define a method that filters out inprogress builds. 2014-04-19 14:04:26 -07:00
gcummings 39d1a605bc [JENKINS-20974] RunParameter with filtering enabled should not include builds which have not completed 2014-04-19 14:04:12 -07:00
Kohsuke Kawaguchi 908a2e1b08 Merge pull request #1044 2014-04-19 13:54:02 -07:00
Chris Arnott 0b49ff91fc [FIXED JENKINS-17050] Close pop-up menu when clicking outside.
The _activationButtonPressed get's set to false onMouseUp, so can not be used to decide if the menu is active or not.
2014-04-19 13:52:34 -07:00
Daniel Beck 12db6c6510 Noted #1186 2014-04-19 22:45:46 +02:00
Kohsuke Kawaguchi 268646db0c Switching to ASM5.
This lets us support plugins written in Java8
2014-04-19 13:39:35 -07:00
Kohsuke Kawaguchi 5a7c8b4e15 Picking up the latest 2014-04-19 13:37:32 -07:00
Kohsuke Kawaguchi bdfbf25129 [FIXED JENKINS-20857] Merged pull request 1060 2014-04-19 12:26:33 -07:00
Kohsuke Kawaguchi d8b72b0921 Documenting why this can be null 2014-04-19 12:25:26 -07:00
gcummings 10ea9941ae [JENKINS-20857] - add unit test which recreates NullPointerException if selected build has been deleted 2014-04-19 12:24:35 -07:00
gcummings f22ecf7d97 [JENKINS-20857] - Add some null checks to RunParameterValue 2014-04-19 12:24:30 -07:00
Kohsuke Kawaguchi f1c70147ac Merge pull request #1100 from kevinburke/task-link-class
Pass through task-link CSS class to confirmationLink dialog
2014-04-19 12:07:30 -07:00
Kohsuke Kawaguchi 64083079dc Merge pull request #1099 from kevinburke/link-both-consoles
Add console-output class even while div is in progress
2014-04-19 12:06:34 -07:00
anafke 6566a0c7f9 [FIXED JENKINS-21729] Fix IE8 NPE with respect to sortability
IE8 (and I assume other browsers that use a doctype pre-html5) interpret the span outside of the link, as in HTML4.01 you needed the closing tag.
http://www.w3.org/TR/REC-html40/struct/global.html#h-7.5.4

The code was causing a NPE in IE8 and users could not sort the columns.

>> cell.innerHTML = '<a href="#" class="sortheader">'+this.getInnerText(cell)+'<span class="sortarrow" /></a>';

>> cell.innerHTML ;
"<A class=sortheader href="#"> S<SPAN class=sortarrow></A></SPAN>"

>> cell.innerHTML = '<a href="#" class="sortheader">'+this.getInnerText(cell)+'<span class="sortarrow"></span></a>'

>> cell.innerHTML ;
"<A class=sortheader href="#"> S<SPAN class=sortarrow></SPAN></A>"
2014-04-19 12:02:47 -07:00
Kohsuke Kawaguchi 3cde986ccf Merge pull request #1197 from christ66/remotingupdate
Upgrade remoting to 2.40
2014-04-19 11:56:00 -07:00
Jesse Glick b6b7bfd27c [FIXED JENKINS-22681] Fix of JENKINS-19418 should have used getById, not load, to avoid reloading the last build gratuitously. builds/113 changes/113 2014-04-18 18:36:55 -04:00
Jesse Glick b55c157813 [JENKINS-22681] Additional logging useful for diagnosing certain lazy-loading bugs. 2014-04-18 18:30:29 -04:00
Oliver Gondža e12e40adc6 Noting #1175 2014-04-18 23:22:48 +02:00
Oliver Gondža fc471153db Merge pull request #1175 from daniel-beck/JENKINS-21720-2
[FIXED JENKINS-20597 JENKINS-21720] Improved config confirmation.
2014-04-18 23:08:29 +02:00