Oliver Gondža
5bfaca449c
Merge pull request #1472 from jbaranov/JENKINS-25514
...
[JENKINS-25514] Fixed lock case in FutureImpl
2015-01-06 11:52:32 +01:00
Bernie Schelberg
e00f99251e
Fixed min/max operations in ComputerRetentionWork
...
As previously implemented, nextCheck would always happen in 1 minute, regardless
of what the RetentionStrategy.check() returned.
2015-01-06 14:59:52 +11:00
Jesse Glick
4470b9ea04
JUnit 4.
builds/334
changes/334
2015-01-05 18:01:32 -05:00
Jesse Glick
3e344a94a9
[FIXED JENKINS-10944] [FIXED JENKINS-24519] If makeBuildable fails on a FlyweightTask, keep it in queue.
2015-01-05 17:02:52 -05:00
Shawn McCarthy
5abb0da923
JENKINS-19634 Fix sorting percentages. Make sure > and < percentages besides 0 and 100 get calculated correctly.
2015-01-05 13:58:11 -07:00
Jesse Glick
64cb70e09a
Merge branch 'master' into FlyweightTask-JENKINS-10944
2015-01-05 15:52:41 -05:00
Jesse Glick
449fd234a6
Indentation fix.
builds/333
changes/333
2015-01-05 15:52:23 -05:00
Jesse Glick
d2327bf883
Merge branch 'master' into FlyweightTask-JENKINS-10944
2015-01-05 15:49:50 -05:00
Jesse Glick
778e9e194e
JUnit 4.
builds/332
changes/332
2015-01-05 15:45:16 -05:00
Shawn McCarthy
c02c93543a
JENKINS-19634 Fix sorting percentages. Take care of <100% and >0%.
2015-01-05 13:31:14 -07:00
Jesse Glick
efb7ebcda8
ifBlockedByHudsonShutdown renamed to isBlockedByShutdown.
2015-01-05 15:06:08 -05:00
Jesse Glick
c3021e92ea
Deprecating Jenkins.FLYWEIGHT_SUPPORT configuration flag.
...
Plenty of plugins assume that a FlyweightTask will behave in a certain way
and might break if this feature were simply disabled.
2015-01-05 15:01:08 -05:00
Kohsuke Kawaguchi
4e0af4319c
Merge pull request #1443 from mattmoor/master
...
Change Jenkins to use a single consistent data-binding field.
2015-01-05 10:56:25 -08:00
Kohsuke Kawaguchi
239caf89ec
the trunk is toward 1.598-SNAPSHOT
2015-01-04 17:45:38 -08:00
Kohsuke Kawaguchi
26e0ef5887
creating an RC branch
2015-01-04 17:45:34 -08:00
Kohsuke Kawaguchi
e442828f33
merged back the RC branch
...
Conflicts:
cli/pom.xml
core/pom.xml
test/pom.xml
war/pom.xml
2015-01-04 17:38:41 -08:00
Kohsuke Kawaguchi
8166c60243
updated changelog as a part of the release
2015-01-04 16:45:00 -08:00
Kohsuke Kawaguchi
e38ccbe302
updated changelog for release
2015-01-04 15:16:28 -08:00
Kohsuke Kawaguchi
d6499f8818
[maven-release-plugin] prepare for next development iteration
2015-01-04 15:09:43 -08:00
Kohsuke Kawaguchi
d76de1e337
[maven-release-plugin] prepare release jenkins-1.596
jenkins-1.596
2015-01-04 15:09:42 -08:00
Oliver Gondža
818ae76af8
[FIXED JENKINS-26281] Allow users to delete builds even if they are supposed to be kept
...
This expects that any mechanism that keeps builds handles their disappearance gracefully.
2015-01-04 18:04:31 +01:00
Shawn McCarthy
d65227b4ec
JENKINS-19634 Fix sorting percentages
2015-01-02 22:39:17 -07:00
ikedam
ca561319fd
[FIXED JENKINS-26270] Added "lastCompletedBuild" to permalinks.
2015-01-03 13:13:14 +09:00
Jesse Glick
7d248e3572
Merge pull request #1507 from darxriggs/no-more-GroovyHudsonTestCase
...
not using the deprecated GroovyHudsonTestCase anymore
2015-01-02 12:36:15 -05:00
Jesse Glick
42fede3248
Merge pull request #1505 from darxriggs/junit3-to-junit4
...
convert tests from JUnit3 to JUnit4
2015-01-02 12:33:41 -05:00
Oliver Gondža
3692db7edb
Merge pull request #1469 from deadmoose/patch-1
...
Fix typoo.
2015-01-02 09:33:30 +01:00
René Scheibe
8aebada975
not using the deprecated GroovyHudsonTestCase anymore
...
* just the two updated classes were affected
2015-01-02 01:52:41 +01:00
Oliver Gondža
1472258535
Merge pull request #1506 from skwuent/master
...
document-properties imgs get transparent background
2015-01-01 11:00:32 +01:00
NGK Sternhagen
e9bb80beae
document-properties imgs get transparent bkgrd
...
Other 24x24 images have this, changed document-properties.png and .gif to
match.
2014-12-31 20:09:48 -08:00
Jesse Glick
59d491f967
Throwable.printStackTrace() to stderr is gratuitous when we are sending the exception to Logger.
builds/331
changes/331
2014-12-29 16:16:01 -05:00
Jesse Glick
2d8bb7c849
Javadoc updates.
builds/330
changes/330
2014-12-29 16:04:19 -05:00
Jesse Glick
2beaa95845
s/XXX/TODO/
builds/329
changes/329
2014-12-29 14:51:52 -05:00
Jesse Glick
1fcee97d2f
[FIXED JENKINS-26196] More robust handling of server errors in FilePath.installIfNecessaryFrom.
2014-12-29 14:49:27 -05:00
Jesse Glick
babfb832a3
JUnit 4.
builds/328
changes/328
2014-12-29 14:00:48 -05:00
Jesse Glick
c527628db9
installIfNecessaryFrom Javadoc improvements and nullness annotations.
2014-12-29 12:18:53 -05:00
Jesse Glick
568f906964
[FIXED JENKINS-26201] Noting 47fa17b, misattributed to an unrelated issue.
2014-12-29 11:55:27 -05:00
Jesse Glick
1078e6b68f
Added assertion as suggested in JENKINS-22767.
builds/327
changes/327
2014-12-29 10:01:22 -05:00
Jesse Glick
bacca38aac
[JENKINS-24380] Linking to Wiki from log message too.
builds/326
changes/326
2014-12-29 09:34:12 -05:00
René Scheibe
73efe6825a
convert tests from JUnit3 to JUnit4
...
* life goes on :-)
* touching all tests that directly inherit from junit.framework.TestCase
2014-12-27 22:41:09 +01:00
Harald Albers
447fe9c5b8
Merge pull request #1504 from darxriggs/maven-pom-cleanup
...
cleanup - make pom.xml files more consistent
2014-12-27 15:06:52 +01:00
René Scheibe
d2f49da5b6
cleanup - make pom.xml files more consistent
2014-12-25 18:20:07 +01:00
Oliver Gondža
cf638efee9
Merge pull request #1502 from darxriggs/master
...
fix Javadoc
2014-12-24 00:04:59 +01:00
René Scheibe
9ce5cec112
fix Javadoc
2014-12-23 22:00:59 +01:00
Kohsuke Kawaguchi
1e8bfc8ac7
Eliminate the use of static field to keep filters.
...
This helps with the situation where multiple Jenkins instances exist in memory (at the same time or at different times sequentially), such as during unit tests.
builds/325
changes/325
2014-12-23 12:17:31 -08:00
Kohsuke Kawaguchi
b47d450ddb
Fixed RunIdMigratorTest failures in non-EST time zone
...
RunIdMigrator.LEGACY_ID_FORMATTER was static, which gets instantiated before the time zone is overriden during the test. Changing this to an instance field so that it gets created later on.
2014-12-23 11:33:23 -08:00
CloudBees DEV@Cloud
4c474cea6f
Merge commit '711b3325adf629585d60aa5a2bcac1d49b8324ae'
builds/324
2014-12-23 16:59:01 +00:00
Jesse Glick
78cb49b86a
[JENKINS-11172] Noting merge of #1388 .
2014-12-23 09:06:35 -05:00
Oliver Gondža
aa72b264dc
Noting #1500
2014-12-23 14:39:57 +01:00
Oliver Gondža
a89bcddc89
Merge pull request #1500 from daniel-beck/JENKINS-25897
...
[FIXED JENKINS-25897] Add range check for H(X-Y) syntax
2014-12-23 14:25:28 +01:00
Daniel Beck
8d60595fce
[JENKINS-11172] Return HTTP 404 on /signup URL if not possible
2014-12-23 13:39:55 +01:00