Thomas Suckow
97cffbe2e4
[FIXED JENKINS-28425] Fix build history styling badness
2015-05-15 08:51:48 -07:00
tfennelly
e84ab69445
Small updates based on jglick comments
2015-05-15 14:47:03 +01:00
tfennelly
2c6bc734b7
Merge branch 'master' into extensionlist-listener
...
* master: (61 commits)
[JENKINS-28384] Noting merge of #1700 .
update changelog: PR 1682 -> issue 28233, fix markup issue
Remove duplicated 1.613 section from changelog
[FIXED JENKINS-28384] NPE when Node.toComputer → null.
Refactor fingerprint classes: Javadoc and annotations
fixup ce747f942c
Refactor ArgumentListBuilder#toWindowsCommand
Improve ArgumentListBuilder#toWindowsCommand test coverage
Forgotten @Test annotation
updated changelog for release
updated changelog for release
[maven-release-plugin] prepare release jenkins-1.613
[maven-release-plugin] prepare for next development iteration
Report launcher exited before establishing the channel
Remove erroneous '+ ' from log message.
Increase visibility of Java 7 requirement
Expose SlaveComputer#getLogDir() explicitly
[FIXED JENKINS-28227] Switch to Enblish locale in RunTest#getDurationString to test messages.
Noting #1591
Noting #1682
...
2015-05-15 14:28:45 +01:00
Ing. Pavel Janousek
3cc5162d68
[JENKINS-28041] Code clean-up
2015-05-15 14:33:54 +02:00
Oleg Nenashev
1cd30ac665
Annotate JenkinsLocationConfiguration according to the current behavior
2015-05-15 11:31:26 +03:00
Oliver Gondža
baa192499a
Do not follow href after sending POST via l:task
...
Simple `<l:task post="true" href="someurl"/>` triggers post request as expected
but then proceeds to href as normal link to. If the URL accepts GET then request
is sent twice it if does not after POSTing on background user get
'POST is required' error.
2015-05-15 09:14:08 +02:00
Jesse Glick
98a6c6f26c
Merge pull request #1699 from oleg-nenashev/fingerprints-api
...
Refactor Fingerprint classes: Javadoc and annotations
2015-05-14 09:37:31 -04:00
Jesse Glick
6966f33d3d
[JENKINS-28384] Noting merge of #1700 .
2015-05-14 09:15:50 -04:00
Oliver Gondža
0f0047a17d
Merge pull request #1701 from jglick/backport-JENKINS-26781
...
[JENKINS-26781] Backport to 1.609
jenkins-1.609.1-rc1
2015-05-14 14:10:51 +02:00
Jesse Glick
c15bd27978
Using @Restricted(NoExternalUse.class) rather than @since for backported API additions (as opposed to b62a07c0db).
2015-05-14 06:50:10 -04:00
Jesse Glick
3ebd0b3930
@kohsuke requested some more comments in the code itself.
...
Given the minefield that is databinding, that seems prudent.
(cherry picked from commit 8e0cbbc98b )
2015-05-14 06:42:10 -04:00
Jesse Glick
11d46ad639
[JENKINS-28110] Reproduced problem in test.
...
Starting in 4f24a02 (1.587-SNAPSHOT, before #1443 or stapler #39 ), nestedDescribableOverridingId passes.
nestedDescribableSharingClass fails given {stapler-class: D3, kind: d3a}.
(Stapler has no way of interpreting kind since it knows nothing of Descriptor, only implementation class names.)
In master (3080573 ), both fail in the way reported (only kind is passed in).
After adding stapler-class back, nestedDescribableOverridingId passes again.
(cherry picked from commit 1f41bec8ef )
2015-05-14 06:42:00 -04:00
Jesse Glick
2e51740fbe
[FIXED JENKINS-28110] Always generate stapler-class, even when generating kind.
...
(cherry picked from commit ef2b6580a8 )
2015-05-14 06:41:54 -04:00
Jesse Glick
83c7f8467c
[FIXED JENKINS-28093] Reverting getDownloadableId from #1563 . Not compatible.
...
(cherry picked from commit 972db2a593 )
2015-05-14 06:41:39 -04:00
Jesse Glick
30f13604b8
newInstancesFromHeteroList should recover gracefully from the case that both kind and $class are missing.
...
(cherry picked from commit 17a88352ab )
2015-05-14 06:41:31 -04:00
Jesse Glick
ecc848b20d
[FIXED JENKINS-28011] Amending #1563 , ${descriptor} is not necessarily ${attrs.descriptor}!
...
(cherry picked from commit 343382b9ff )
2015-05-14 06:41:12 -04:00
Jesse Glick
13ea8b76d2
Reverting whitespace change.
...
(cherry picked from commit f4ddac1083 )
2015-05-14 06:40:47 -04:00
Kohsuke Kawaguchi
ed9b16ece3
Doc improvements
...
(cherry picked from commit 3c4b1e63a2 )
2015-05-14 06:38:22 -04:00
Kohsuke Kawaguchi
d7a75713b2
$class is not legacy, stapler-class is, so making sure it's not getting mixed up.
...
(cherry picked from commit 4e2efcda7e )
2015-05-14 06:38:17 -04:00
Jesse Glick
10821fc0a4
Noting deprecations more widely.
...
(cherry picked from commit 37167d5f08 )
2015-05-14 06:38:13 -04:00
Jesse Glick
acc55190bb
findByClassName should not be advertised to outside code.
...
(cherry picked from commit 8dd079a8f0 )
2015-05-14 06:38:07 -04:00
Jesse Glick
9079eb8070
Improving Javadoc.
...
(cherry picked from commit 33923db173 )
2015-05-14 06:38:00 -04:00
Jesse Glick
0a6249e63a
Added @since.
...
(cherry picked from commit c4c7259849 )
2015-05-14 06:37:52 -04:00
Jesse Glick
df7d8623b9
Now it passes.
...
(cherry picked from commit 8f1883a0ca )
2015-05-14 06:37:46 -04:00
Jesse Glick
00cbb28231
[JENKINS-26781] Reproduced problem in test.
...
Besides failing in master, it also fails in 4e0af43 (merge of #1443 ), but passes in the 1.598-SNAPSHOT parent 239caf8 .
(cherry picked from commit 33041903ab )
2015-05-14 06:37:04 -04:00
Nicolas De Loof
5ecda76899
make $class and kind mutually exclusive
...
Use kind when descriptor.id != descriptor.clazz.name and $clazz otherwise.
(cherry picked from commit 901194ae77 )
2015-05-14 06:36:47 -04:00
Nicolas De Loof
929adc5162
deprecated find(string) and introduce explicit methods
...
to lookup descriptor by id or by Describable class name
(cherry picked from commit 6a8ce6ca09 )
2015-05-14 06:36:20 -04:00
Nicolas De Loof
dfa17c4a18
[JENKINS-26781] lookup descriptor by ID, then by class if explicitly set
...
to match some specific use cases.
(cherry picked from commit 8881703f7c )
2015-05-14 06:36:13 -04:00
Jesse Glick
aadc9914ff
[FIXED JENKINS-28384] NPE when Node.toComputer → null.
...
(cherry picked from commit 86bac90fcb )
2015-05-14 08:28:24 +02:00
Jesse Glick
49f5a45867
Merge pull request #1700 from jglick/NPE-JENKINS-28384
...
[JENKINS-28384] NPE when Node.toComputer → null
2015-05-13 18:54:17 -04:00
Harald Albers
550ba0c1be
update changelog: PR 1682 -> issue 28233, fix markup issue
2015-05-13 21:11:32 +02:00
Harald Albers
f49a2ce170
Remove duplicated 1.613 section from changelog
2015-05-13 21:08:40 +02:00
Jesse Glick
86bac90fcb
[FIXED JENKINS-28384] NPE when Node.toComputer → null.
2015-05-13 14:19:45 -04:00
Oleg Nenashev
efe1f3b915
Merge pull request #1686 from ikedam/feature/JENKINS-28227_fixGetDurationStringTest
...
[FIXED JENKINS-28227] Switch to Enblish locale in RunTest#getDurationString to test messages.
2015-05-13 19:32:08 +03:00
Oleg Nenashev
cfc7f2ddc4
Refactor fingerprint classes: Javadoc and annotations
2015-05-13 19:19:22 +03:00
Oliver Gondža
f728da2bb3
fixup ce747f942c
2015-05-13 14:23:33 +02:00
Oliver Gondža
ce747f942c
Refactor ArgumentListBuilder#toWindowsCommand
2015-05-13 13:30:44 +02:00
Oliver Gondža
90ef211065
Merge pull request #1697 from olivergondza/win-launcher-escape-tests
...
Improve ArgumentListBuilder#toWindowsCommand test coverage
2015-05-13 13:07:48 +02:00
Jesse Glick
caedb49c23
[JENKINS-27289] Noting merge of #1598 .
2015-05-12 12:48:00 -04:00
Oliver Gondža
410fd3f596
Improve ArgumentListBuilder#toWindowsCommand test coverage
2015-05-12 14:39:38 +02:00
Oliver Gondža
0d553783fd
Merge pull request #1688 from olivergondza/report-launcher-exited
...
Report launcher exited before establishing the channel
2015-05-11 19:20:00 +02:00
Oliver Gondža
32da5d7936
Forgotten @Test annotation
2015-05-11 14:45:04 +02:00
Felix Belzunce Arcos
21b2859d6c
Remove re-throw
2015-05-11 12:22:01 +02:00
Kohsuke Kawaguchi
718eca5745
updated changelog for release
2015-05-10 17:41:53 -07:00
Kohsuke Kawaguchi
b393981026
updated changelog for release
2015-05-10 16:44:44 -07:00
Kohsuke Kawaguchi
8373984f6e
[maven-release-plugin] prepare release jenkins-1.613
jenkins-1.613
2015-05-10 16:36:26 -07:00
Kohsuke Kawaguchi
359e38e73d
[maven-release-plugin] prepare for next development iteration
2015-05-10 16:36:26 -07:00
Oleg Nenashev
0d1efdad30
[JENKINS-27871] - Added a direct unit test for the issue
...
(cherry picked from commit 7514e8c6ce )
2015-05-08 15:59:14 +02:00
Stephen Connolly
11b89d9c0b
[FIXED JENKINS-27708][FIXED JENKINS-27871] Ensure that identification of blocked tasks is using the live state.
...
- The creation of a snapshot itself should be relatively cheap given the expected rate of
job execution. You probably would need 100's of jobs starting execution every iteration
of maintain() before this could even start to become an issue and likely the calculation
of isBuildBlocked(p) will become a bottleneck before updateSnapshot() will. Additionally
since the snapshot itself only ever has at most one reference originating outside of the stack
it should remain in the eden space and thus be cheap to GC.
- JENKINS-27708 comments 225819 and 225906 provide more complex but logically equivalent fixes of
this issue. I am favouring this approach as it is simpler and provides less scope for error as any
new helper methods can just rely on the snapshot being up to date whereas with the other
two candidates if a new helper method is introduced there is the potential to miss adding support
for the live view. The comment 225819 has the risk of introducing extra lock contention while
the comment 225906 version forces every access to the helper methods to pass a second memory
barrier
(cherry picked from commit 5880ed8302 )
2015-05-08 15:59:14 +02:00
Daniel Beck
1fed368e49
[FIXED JENKINS-27067] Larger minimum popup menu height
...
(cherry picked from commit f6454983ac )
2015-05-08 15:56:44 +02:00