christ66
cd0752432e
Merge remote-tracking branch 'upstream/master' into JENKINS-22811
...
Conflicts:
test/src/test/java/hudson/model/ItemGroupMixInTest.java
2015-01-07 13:12:18 -08:00
christ66
3e29bd7eff
[JENKINS-22811] Folder loading can break when an item inside the folder fails to load or throws an Exception.
2015-01-06 19:41:51 -08:00
Jesse Glick
0cdab01c7e
Jenkins was failing to log exceptions from raw Runnable/Callable sent to Timer (without using SafeTimerTask, PeriodicWork, etc.).
2015-01-06 09:54:16 -05:00
Oliver Gondža
fb832b76a3
Merge pull request #1514 from bschelberg/master
...
Fixed min/max operations in ComputerRetentionWork
2015-01-06 12:17:58 +01:00
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
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
Jesse Glick
59d491f967
Throwable.printStackTrace() to stderr is gratuitous when we are sending the exception to Logger.
2014-12-29 16:16:01 -05:00
Jesse Glick
2d8bb7c849
Javadoc updates.
2014-12-29 16:04:19 -05:00
Jesse Glick
2beaa95845
s/XXX/TODO/
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
c527628db9
installIfNecessaryFrom Javadoc improvements and nullness annotations.
2014-12-29 12:18:53 -05:00
Jesse Glick
1078e6b68f
Added assertion as suggested in JENKINS-22767.
2014-12-29 10:01:22 -05:00
Jesse Glick
bacca38aac
[JENKINS-24380] Linking to Wiki from log message too.
2014-12-29 09:34:12 -05: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.
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'
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
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
Kohsuke Kawaguchi
711b3325ad
[JENKINS-24380]
...
- Recorded the fix in changelog.
- Added a separate screen to show the unmigration instruction, which
makes it easier for people to find it than search logs.
2014-12-22 17:19:04 -08:00
Daniel Beck
9a8329ebfe
[FIXED JENKINS-25897] Add range check for H(X-Y) syntax
2014-12-23 01:40:47 +01:00
Kohsuke Kawaguchi
6f0eb9be59
Path could include whitespace, so double quote would be nice.
2014-12-22 15:59:32 -08:00
Kohsuke Kawaguchi
7320802726
minor doc improvements
2014-12-22 15:58:39 -08:00
Kohsuke Kawaguchi
ebe2f8cf05
Formatting change: static import
2014-12-22 15:53:11 -08:00
Kohsuke Kawaguchi
296849edf9
Merge pull request 1379
2014-12-22 14:33:48 -08:00
Jesse Glick
2f59ffc475
[FIXED JENKINS-19392] Simpler and more efficient to use String.intern to compact fingerprint data.
...
This should work across builds and even across jobs, and does not force us to load other builds.
2014-12-22 16:18:44 -05:00
Jesse Glick
47fa17ba61
[FIXED JENKINS-23568] Be sure to release WorkspaceList.Lease deterministically in a finally block.
2014-12-22 15:08:34 -05:00
Daniel Beck
277b17758e
[FIXED JENKINS-11172] Don't throw exception on /signup when not possible
2014-12-21 02:34:21 +01:00
Kohsuke Kawaguchi
f7389c5b6d
report the version number as well
2014-12-16 15:46:51 -08:00
Jesse Glick
1e198e6f88
ItemsTest.moveItem showed that if migrate is called on a nonexistent directory, we should do nothing.
2014-12-15 16:17:35 -05:00
Jesse Glick
c6486e2b4d
#1406 silently skipped the call to moveDirectory in case newBuildDir.isDirectory(), rather than throwing an IOE as renameTo does.
...
Also deleting apparently useless call to forceMkdir.
2014-12-15 16:16:29 -05:00
Jesse Glick
589d74a55e
Making reverse migration tool handle more kinds of item groups.
2014-12-15 15:51:45 -05:00
Jesse Glick
0a9b638280
Added a tool to reverse the build directory migration if required.
2014-12-15 14:26:36 -05:00
Jesse Glick
507412e0db
Safer to use AtomicFileWriter.
2014-12-12 15:43:38 -05:00
Jesse Glick
7c988de3cd
Merge branch 'master' into build-number-is-id-JENKINS-24380
2014-12-12 13:27:31 -05:00
Jesse Glick
76adbf9223
Merge branch 'master' of git://github.com/jenkinsci/jenkins
2014-12-12 13:27:26 -05:00
Jesse Glick
c6deabb1b1
Forgotten @since.
2014-12-11 17:52:50 -05:00
Oliver Gondža
fef4ef1c61
Merge pull request #1482 from olivergondza/node-monitor-refactorization
...
Node monitor refactorization
2014-12-11 21:58:45 +01:00
Jesse Glick
81701326a0
Merge branch 'unique-Permission' ( #1444 ).
2014-12-10 09:27:54 -05:00
Jesse Glick
ce94579c50
[FIXED JENKINS-25788] RunMap.remove was always returning false, even when the Run was in fact removed.
2014-12-09 15:24:06 -05:00
Eugene Baranov
3edae667b3
[JENKINS-25514] Fixed lock case in FutureImpl
...
when some other process is waiting for build in queue.
2014-12-09 21:51:39 +02:00
Jesse Glick
cce358bf39
Merge branch 'master' of git://github.com/jenkinsci/jenkins
...
Conflicts:
changelog.html
2014-12-09 14:22:05 -05:00
Nicolas De Loof
ff80b5792a
JDK8 installer require exclusive access to the installation directory, so can’t log there.
2014-12-09 14:18:24 +01:00
Nicolas De Loof
a98ccdff0f
[JENKINS-19447] use standard arguments to set installer log file.
...
Tested on a windows box to automaticaly install 1.4, 1.5, 1.6, 1.7 and 1.8 JDKs
2014-12-09 13:00:17 +01:00
Oliver Gondža
e234c29078
Introduce MonitorOfflineCause
2014-12-07 18:53:12 +01:00
Oliver Gondža
e382bbae1b
[FIXED JENKINS-23797] Produce human readable output in DiskSpaceMonitorDescriptor.DiskSpace.toString()
2014-12-07 18:45:00 +01:00
Jesse Glick
eb8d3100dd
Missing @since.
2014-12-05 15:13:39 -05:00
Jesse Glick
6318b8d800
[FIXED JENKINS-25937] Treat BadPaddingException as an unloadable key and continue.
2014-12-05 12:07:50 -05:00
Jesse Glick
e4c5c71042
Misleading error message.
2014-12-05 11:32:51 -05:00
christ66