Jesse Glick
0bd831e2d9
matrix-project 1.0
builds/115
changes/115
2014-04-28 15:04:07 -04:00
Jesse Glick
9a32f9a285
Merge branch 'master' of git://github.com/jenkinsci/jenkins
2014-04-28 10:34:09 -04:00
Kohsuke Kawaguchi
a93f46193e
the trunk is toward 1.563-SNAPSHOT
2014-04-28 07:13:26 -07:00
Kohsuke Kawaguchi
d367524bb6
creating an RC branch
2014-04-28 07:13:21 -07:00
Kohsuke Kawaguchi
3e1a03eae7
merged back the RC branch
2014-04-28 07:12:29 -07:00
Kohsuke Kawaguchi
b559582d1e
updated changelog as a part of the release
2014-04-28 07:12:26 -07:00
Jesse Glick
e8267c8ceb
Preventing potential NPE on shutdown.
builds/114
changes/114
2014-04-28 09:44:23 -04:00
Kohsuke Kawaguchi
5ee9c10352
updated changelog for release
2014-04-27 18:44:16 -07:00
Kohsuke Kawaguchi
a886a52267
[maven-release-plugin] prepare for next development iteration
2014-04-27 18:34:39 -07:00
Kohsuke Kawaguchi
d5b4fcb245
[maven-release-plugin] prepare release jenkins-1.561
jenkins-1.561
2014-04-27 18:34:38 -07:00
Daniel Beck
4c06e70635
Noting #1196 , #1200 , #1201
2014-04-27 03:01:33 +02:00
Daniel Beck
1f06981735
Merge pull request #1196 from daniel-beck/JENKINS-22672
...
[FIXED JENKINS-22672] Make /threadDump easier to use.
2014-04-27 02:58:14 +02:00
Daniel Beck
7f943027b0
Merge pull request #1200 from daniel-beck/JENKINS-22688
...
[FIXED JENKINS-22688] Made graph font explicit and configurable
2014-04-27 02:57:51 +02:00
Daniel Beck
4570b80ae1
Merge pull request #1201 from daniel-beck/JENKINS-22689
...
[FIXED JENKINS-22689] Show load statistics for master node
2014-04-27 02:57:12 +02:00
Oliver Gondža
9e6771803f
Noting #1208 and #1199
2014-04-24 13:52:48 +02:00
Daniel Beck
4d4286d90b
[JENKINS-22686] Don't use fixed pixel count for label distance.
...
Instead, use a distance of 0.5x the width/height of the label.
This improves appearance in combination with JENKINS-22688 for
different font sizes.
2014-04-24 13:52:48 +02:00
Daniel Beck
44d170b29c
[FIXED JENKINS-22686] Add a few pixels distance between tick labels.
2014-04-24 13:52:48 +02:00
Daniel Beck
82e52456f8
Show full display name of SCMedItem on polling status page.
2014-04-24 13:52:48 +02:00
Oliver Gondža
05ae0809cc
[FIXED JENKINS-22715] Merge pull request #1208 from mika/mika/fix_debian_upgrades
...
Debian postinst: check for present user/group before adding them
2014-04-24 13:39:29 +02:00
Jesse Glick
dad71f5309
[JENKINS-20662] Noting merge of #1191 .
2014-04-23 16:40:02 -04:00
Jesse Glick
b227088704
Merge branch 'JENKINS-20662' of github.com:daniel-beck/jenkins
2014-04-23 16:38:23 -04:00
Daniel Beck
b59c490a3b
[JENKINS-20662] Simplify test after feedback
2014-04-23 21:46:02 +02:00
Kohsuke Kawaguchi
54c5df2c34
trying to come up with a better representation. Not sure if I'm succeeding
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
d8af9b3680
adding assertion
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
666f0b4781
Fixing a bug.
...
pending was null as soon as task started running, so it was possible that another thread submits the task and have that executed while the first one was still running
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
00336a1d07
a test case that reveals a bug in AtmostOneTaskExecutor
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
d8a27358b3
made this list configurable
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
4b9387795f
defer MavenEmbedder creation
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
a8e05e2446
Resolving dependencies among other JPL files
2014-04-22 11:35:41 -07:00
Kohsuke Kawaguchi
bd0c5b28c3
Moving the logic into an inner class.
...
This is in preparation of resolving dependencies within "List<URL> all"
2014-04-22 11:35:40 -07:00
Nicolas De loof
22e64ab7c2
Merge pull request #1167 from christ66/ZD-16606
...
Fix issue where restart would not properly display username if user was not loaded.
2014-04-22 16:36:06 +02:00
Nicolas De Loof
9220f082aa
simplify logic to avoid code duplication
2014-04-22 11:31:44 +02:00
Michael Prokop
1b706c194a
Debian postinst: check for present user/group before adding them
...
In git commit 7216aab0d the check for present user was removed
and therefore upgrading the Debian package on existing Jenkins
installations fails. Also the newly added code for adding a
configurable Jenkins group is missing a check for a possibly
already present Jenkins group.
Closes: JENKINS-22710
2014-04-22 11:13:53 +02:00
Kohsuke Kawaguchi
817f8dc4ab
the trunk is toward 1.562-SNAPSHOT
2014-04-20 19:25:16 -07:00
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
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