Commit Graph
17505 Commits
Author SHA1 Message Date
Alex Earl ed7828b959 Merge branch 'scmpolllistener' 2013-12-19 11:24:56 -07:00
Alex Earl 4fbe1a1fe6 Merge branch 'master' of github.com:jenkinsci/jenkins into scmpolllistener 2013-12-19 11:22:12 -07:00
Kohsuke Kawaguchi 168c50c4d3 the trunk is toward 1.546-SNAPSHOT 2013-12-18 18:02:32 -08:00
Kohsuke Kawaguchi 6c71a664b3 creating an RC branch 2013-12-18 18:02:27 -08:00
Jesse Glick a6e01f77c6 [FIXED JENKINS-21078] Optimizing loadIdOnDisk. builds/2 changes/2 2013-12-18 13:39:18 -05:00
Jesse Glick 358fe7fe3a Extra trailing newline. 2013-12-18 11:25:28 -05:00
Jesse Glick d81c2406a2 Updated maven-plugin & mailer dependencies so that HelpLinkTest will pass. 2013-12-17 18:55:29 -05:00
Jesse Glick 6c9ab145d3 copyButton.js uses @include, so there is no need to explicitly include ZeroClipboard here too. 2013-12-17 16:38:46 -05:00
Alex Earl 4364a58c0d Add note to class javadoc 2013-12-17 12:30:09 -07:00
Jesse Glick 3befec39a3 optionalBlock.jelly should only set a default value for help when field is set.
Otherwise Descriptor.getHelpFile(null) is called, which may produce a help page, but generally the wrong one.
(entry.jelly was already correct, so just making it consistent.)
2013-12-17 12:13:44 -05:00
Jesse Glick ef0b084995 Moving some help files to mailer-plugin where they belong. 2013-12-17 11:49:51 -05:00
Ingo Richter 65f86c9530 Merge pull request #1068 from kmaehashi/add-encoding-osx
set file.encoding=UTF-8 as default in OS X runner
2013-12-17 08:29:25 -08:00
Kenichi Maehashi 7eecfeb261 set file.encoding=UTF-8 as default in OS X runner 2013-12-18 01:10:05 +09:00
Jesse Glick 66805b7463 Why did these tests have timeouts?
Seems to have caused spurious timeout errors.
https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/1748/testReport/junit/hudson.scheduler/CronTabEventualityTest/testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek_0_/
java.lang.Exception: test timed out after 1000 milliseconds
	at java.io.UnixFileSystem.getBooleanAttributes0(Native Method)
	at java.io.UnixFileSystem.getBooleanAttributes(UnixFileSystem.java:242)
	at java.io.File.exists(File.java:772)
	at sun.misc.URLClassPath$FileLoader.getResource(URLClassPath.java:1072)
	at sun.misc.URLClassPath.getResource(URLClassPath.java:199)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:358)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:424)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
	at hudson.scheduler.CronTab.set(CronTab.java:87)
	at hudson.scheduler.CronTab.<init>(CronTab.java:83)
	at hudson.scheduler.CronTab.<init>(CronTab.java:66)
	at hudson.scheduler.CronTabEventualityTest.checkEventuality(CronTabEventualityTest.java:113)
	at hudson.scheduler.CronTabEventualityTest.testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek(CronTabEventualityTest.java:109)
2013-12-16 16:25:05 -05:00
Jesse Glick c3508113f0 [FIXED JENKINS-21024] Catch a full range of XStreamException’s during deserialization, including rethrown exceptions from readResolve. 2013-12-16 15:03:07 -05:00
Kohsuke Kawaguchi 23f45e7ced merged back the RC branch 2013-12-15 08:59:31 -08:00
Kohsuke Kawaguchi 0d373fa372 updated changelog as a part of the release 2013-12-15 08:59:28 -08:00
Harald Albers be79a5e82e Merge pull request #1066 from olivierlemasle/fix_fr
Fix french translation
2013-12-15 08:19:16 -08:00
olivierlemasle c9432bda97 Fix french translation 2013-12-15 16:35:34 +01:00
Kohsuke Kawaguchi 8e5a0d37c4 updated changelog for release 2013-12-15 06:07:00 -08:00
Kohsuke Kawaguchi e66ff9b51e [maven-release-plugin] prepare for next development iteration 2013-12-15 05:33:36 -08:00
Kohsuke Kawaguchi 0e85f54373 [maven-release-plugin] prepare release jenkins-1.544 jenkins-1.544 2013-12-15 05:33:30 -08:00
Oliver Gondža 6f9cf72e14 Merge pull request #1056 from ChrisA89/TestHaveSuccessColumn
[JENKINS-11429] Add a column "Success" in test result table
2013-12-14 15:25:27 -08:00
Jesse Glick 4ca5aba3c0 Suppressing a senseless stack trace.
h.n.AbstractNodeMonitorDescriptor$Record#<init>: Previous Free Disk Space monitoring activity still in progress. Interrupting
h.n.AbstractNodeMonitorDescriptor$Record#run: Unexpected node monitoring termination: Free Disk Space
java.lang.InterruptedException
	at java.lang.Object.wait(Native Method)
	at hudson.remoting.Request$1.get(Request.java:272)
	at hudson.remoting.Request$1.get(Request.java:210)
	at hudson.remoting.FutureAdapter.get(FutureAdapter.java:59)
	at hudson.node_monitors.AbstractAsyncNodeMonitorDescriptor.monitor(AbstractAsyncNodeMonitorDescriptor.java:97)
	at hudson.node_monitors.AbstractNodeMonitorDescriptor$Record.run(AbstractNodeMonitorDescriptor.java:282)
2013-12-13 16:56:16 -05:00
Jesse Glick c0c5b076ec DRY: LogRecorderManager.configDir. 2013-12-13 10:49:57 -05:00
Jesse Glick 59ba11bce6 Making a field final. 2013-12-12 21:09:46 -05:00
Jesse Glick 192defb79d Fixing a couple of obsolete references to HudsonTestCase. 2013-12-12 21:09:28 -05:00
Jesse Glick 36b5420a75 Merge branch 'master' of git://github.com/jenkinsci/jenkins 2013-12-12 16:58:35 -05:00
Jesse Glick 676ec9c45b Merge branch 'master' of git://github.com/jenkinsci/jenkins 2013-12-12 16:02:04 -05:00
CloudBees DEV@Cloud 2bd36c0791 Merge commit 'bc4c1326579631be648dc6c47f1200b246743b0a' 2013-12-12 20:29:55 +00:00
Jesse Glick bc4c132657 Plugins with ≥1 functional test and a ≥1.536 dep would sometimes fail during clean builds due to a race condition in WarExploder. 2013-12-12 15:28:52 -05:00
Oliver Gondža ca139a7c9f Merge pull request #1058 from olivergondza/breakable-regex
[FIXED JENKINS-20928] l:breakable mishandles HTML metacharacters
2013-12-12 07:49:16 -08:00
Oliver Gondža 3f1f122ff4 [FIXED JENKINS-20928] l:breakable mishandles HTML metacharacters 2013-12-12 15:16:13 +01:00
CloudBees DEV@Cloud b2edcbae17 Merge commit '85e9e126773c0bb20a8529a2e6591dde17d7e209' 2013-12-11 22:26:52 +00:00
Jesse Glick 85e9e12677 [JENKINS-10615] AbstractProjectTest.testWorkspaceLock frequently fails on jenkins.ci due to InterruptedException in HudsonTestCase.setUp.
Possibly because it is sorted after [JENKINS-15156] testGetBuildAfterGC and the test suite times out.
2013-12-11 17:25:17 -05:00
Oliver Gondža 8bfe089c21 Merge pull request #1032 from olivergondza/modifiable-view-group
Introduce ModifiableViewGroup
2013-12-11 22:14:47 +01:00
Jesse Glick 2a2a7eb8ed [JENKINS-20951] [JENKINS-18410] Did not make it into 1.544 due to validated merge holdups (mostly randomly failing tests, sigh). 2013-12-11 11:11:32 -05:00
Jesse Glick 3a0c087701 Merge branch 'master' of git://github.com/jenkinsci/jenkins 2013-12-11 11:07:47 -05:00
Kohsuke Kawaguchi cf396b0f9a the trunk is toward 1.545-SNAPSHOT 2013-12-11 07:53:34 -08:00
Kohsuke Kawaguchi a1cd8c73fd creating an RC branch 2013-12-11 07:53:30 -08:00
Jesse Glick bce209ef0a Merge branch 'master' of git://github.com/jenkinsci/jenkins 2013-12-11 09:52:19 -05:00
Chris Arnott f6d5448eed [JENKINS-11429] Add a column "Success" in test result table
Added a column Pass (rather than success) to the tables in the junit plugin.
2013-12-11 08:52:11 +00:00
Harald Albers bd94124044 Merge pull request #1053 from ghostganz/typos
Fix Swedish typo
2013-12-11 00:18:20 -08:00
Kohsuke Kawaguchi 6384672534 merged back the RC branch 2013-12-10 18:55:03 -08:00
Kohsuke Kawaguchi 6db47326e1 updated changelog as a part of the release 2013-12-10 18:55:01 -08:00
Kohsuke Kawaguchi 8bc3da877b updated changelog for release 2013-12-10 17:40:23 -08:00
Kohsuke Kawaguchi 3fa120e4b8 [maven-release-plugin] prepare for next development iteration 2013-12-10 16:57:21 -08:00
Kohsuke Kawaguchi c71a7d070d [maven-release-plugin] prepare release jenkins-1.543 jenkins-1.543 2013-12-10 16:57:12 -08:00
Jesse Glick a58e198f8a [FIXED JENKINS-20951] XmlFile.read/unmarshal needs to catch general XStreamException so as to include CannotResolveClassException, thrown when a TopLevelItem provided by a plugin is unloadable. 2013-12-10 18:50:33 -05:00
Jesse Glick fcdf749912 [FIXED JENKINS-18410] AbstractTestResultAction should be a RunAction2 so it need not persist its owning build. 2013-12-10 17:49:41 -05:00